Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts: # Assets/ManagedResources/~Lua/Common/GlobalDefine.luadev_chengFeng
commit
3d0e6a4be4
Binary file not shown.
After Width: | Height: | Size: 51 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 66b98230675802e41afc5c78b43d09d2
|
||||
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: af108911a76b4eb4fb0241383b93ca55
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhiZhunJiangShiAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 54 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dd7561a0b8056d34fb8c48e01a95d74a
|
||||
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: 97b0697d266da864abaf309aec194784
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhiZhunJiangShiAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1212,6 +1212,7 @@ GameObject:
|
|||
- component: {fileID: 8763694731036790869}
|
||||
- component: {fileID: 6827453773365098965}
|
||||
- component: {fileID: 8787480742204803497}
|
||||
- component: {fileID: 1824466655159305522}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -1293,7 +1294,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -1317,6 +1318,25 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &1824466655159305522
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1738818626622132468}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &1865705700983749175
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2163,6 +2183,7 @@ GameObject:
|
|||
- component: {fileID: 447523261559182373}
|
||||
- component: {fileID: 4055703511650152565}
|
||||
- component: {fileID: 2208882108859303264}
|
||||
- component: {fileID: 5115388705739617876}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -2244,7 +2265,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -2262,12 +2283,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 6827453773365098965}
|
||||
m_TargetGraphic: {fileID: 4055703511650152565}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &5115388705739617876
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3169485458113747029}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &3439750458242139417
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2621,6 +2661,7 @@ GameObject:
|
|||
- component: {fileID: 2143084811026749988}
|
||||
- component: {fileID: 4440708746504222784}
|
||||
- component: {fileID: 6382506805364644594}
|
||||
- component: {fileID: 6592731172446235074}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -2702,7 +2743,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -2720,12 +2761,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 6827453773365098965}
|
||||
m_TargetGraphic: {fileID: 4440708746504222784}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &6592731172446235074
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3757593705830530765}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &3996071600163989452
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3012,6 +3072,7 @@ GameObject:
|
|||
- component: {fileID: 7376394573955910915}
|
||||
- component: {fileID: 8061948212848310393}
|
||||
- component: {fileID: 2320184179384494043}
|
||||
- component: {fileID: 6790187467236876035}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -3093,7 +3154,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -3111,12 +3172,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 6827453773365098965}
|
||||
m_TargetGraphic: {fileID: 8061948212848310393}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &6790187467236876035
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4964425777006865531}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &5010858846013541457
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4113,6 +4193,7 @@ GameObject:
|
|||
- component: {fileID: 9133571669316001060}
|
||||
- component: {fileID: 868979852465565746}
|
||||
- component: {fileID: 765146965108979768}
|
||||
- component: {fileID: 5675347470246973719}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -4194,7 +4275,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -4212,12 +4293,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 6827453773365098965}
|
||||
m_TargetGraphic: {fileID: 868979852465565746}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &5675347470246973719
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6737465947424346739}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &6783907460078828264
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -40488,7 +40488,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 50, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 61.48}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7481411220995830971
|
||||
|
@ -41320,7 +41320,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 50, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 217.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1473222624206509369
|
||||
|
@ -42522,7 +42522,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: 34.02, y: 31.59}
|
||||
m_AnchoredPosition: {x: 42.5, y: 0.67}
|
||||
m_SizeDelta: {x: 76.98, y: 96.03}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &3705447925766013972
|
||||
|
@ -52490,6 +52490,101 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u7B80\u535523-23"
|
||||
LanguageIndex: 10520
|
||||
--- !u!1 &1916176777876645745
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6523326471660810093}
|
||||
- component: {fileID: 1048098782015241669}
|
||||
- component: {fileID: 7061158795248392214}
|
||||
- component: {fileID: 8033399430559408519}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6523326471660810093
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1916176777876645745}
|
||||
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: 1929407693109997001}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 535.9, y: -54.33}
|
||||
m_SizeDelta: {x: 1094, y: 95.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1048098782015241669
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1916176777876645745}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7061158795248392214
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1916176777876645745}
|
||||
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: c795223fcde176e4cbbbe5b3b68ea707, 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!114 &8033399430559408519
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1916176777876645745}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 1
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &1961196047483117511
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -58340,13 +58435,14 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.9, y: 0.9, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 6523326471660810093}
|
||||
- {fileID: 3376645615951407419}
|
||||
m_Father: {fileID: 6976277603980592380}
|
||||
m_RootOrder: 8
|
||||
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: -24.5, y: 325}
|
||||
m_AnchoredPosition: {x: -40.5, y: 325}
|
||||
m_SizeDelta: {x: 1015.5, y: 116.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8379277835457233388
|
||||
|
@ -58367,7 +58463,7 @@ MonoBehaviour:
|
|||
m_Top: 129
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_Spacing: 20.79
|
||||
m_Spacing: 19.5
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
|
@ -58516,7 +58612,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: -66.73, y: 31.59}
|
||||
m_AnchoredPosition: {x: -67.7, y: 0.67}
|
||||
m_SizeDelta: {x: 124.37, y: 96.03}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &2929175772825726538
|
||||
|
@ -94818,7 +94914,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: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 6.4}
|
||||
m_SizeDelta: {x: 106.99, y: 93.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2371187725804371199
|
||||
|
@ -94949,7 +95045,7 @@ RectTransform:
|
|||
- {fileID: 1413601642160198233}
|
||||
- {fileID: 5986030589070329730}
|
||||
m_Father: {fileID: 1929407693109997001}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -126000,9 +126096,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3952385394978222417}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 50, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -111.479996}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &109213283015355470
|
||||
|
@ -145278,8 +145374,8 @@ 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: 15.3, y: 36.73}
|
||||
m_SizeDelta: {x: 443.7, y: 139.6}
|
||||
m_AnchoredPosition: {x: 20.19, y: 67.24}
|
||||
m_SizeDelta: {x: 281.17, y: 97.37}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4043422938079142094
|
||||
CanvasRenderer:
|
||||
|
@ -145296,7 +145392,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8795815436689289123}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
@ -145309,7 +145405,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 8bc0409d8bb710b49bb67ad3cf8a3384, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c795223fcde176e4cbbbe5b3b68ea707, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -3973,9 +3973,9 @@ 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: 40, y: -20}
|
||||
m_AnchoredPosition: {x: 129.4, y: -34.9}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 0.5000003, y: 0.5}
|
||||
--- !u!222 &4346489256818483164
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -15517,8 +15517,8 @@ 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: 150, y: -20}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchoredPosition: {x: 11.5, y: -30}
|
||||
m_SizeDelta: {x: 100, y: 75.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3601071905900668928
|
||||
MonoBehaviour:
|
||||
|
|
|
@ -489,6 +489,7 @@ GameObject:
|
|||
- component: {fileID: 1186369652684328741}
|
||||
- component: {fileID: 3489358184231715545}
|
||||
- component: {fileID: 6867022462451501280}
|
||||
- component: {fileID: 4265660168868342776}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -570,7 +571,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -588,12 +589,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8230184370898043899}
|
||||
m_TargetGraphic: {fileID: 3489358184231715545}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &4265660168868342776
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 542377785812200104}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &795481251434019050
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1060,6 +1080,86 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u9886\u53D6"
|
||||
LanguageIndex: 10002
|
||||
--- !u!1 &1864274299572146969
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1121365959429271992}
|
||||
- component: {fileID: 8799121687072226636}
|
||||
- component: {fileID: 953736533333891260}
|
||||
m_Layer: 0
|
||||
m_Name: progress
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1121365959429271992
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1864274299572146969}
|
||||
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: 1350465337999593540}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 315.3, y: -63.7}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8799121687072226636
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1864274299572146969}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &953736533333891260
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1864274299572146969}
|
||||
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: 1, g: 0.93333334, b: 0.8392157, 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: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 2/2
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &2063991881770354046
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1900,6 +2000,7 @@ GameObject:
|
|||
- component: {fileID: 7463882071309610157}
|
||||
- component: {fileID: 8753535019360170754}
|
||||
- component: {fileID: 177029162414362226}
|
||||
- component: {fileID: 8275463732879866760}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -1981,7 +2082,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -1999,12 +2100,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8230184370898043899}
|
||||
m_TargetGraphic: {fileID: 8753535019360170754}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &8275463732879866760
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3824647323492070119}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &3875322589699534660
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2039,7 +2159,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: 57.8, y: 43.4}
|
||||
m_AnchoredPosition: {x: 103.19, y: 37}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7912622959724688922
|
||||
|
@ -2727,6 +2847,7 @@ RectTransform:
|
|||
- {fileID: 8669047331830701111}
|
||||
- {fileID: 5660903253093529981}
|
||||
- {fileID: 6713643918384602890}
|
||||
- {fileID: 1121365959429271992}
|
||||
- {fileID: 4062633902952021743}
|
||||
m_Father: {fileID: 3026942363793877950}
|
||||
m_RootOrder: 4
|
||||
|
@ -8467,6 +8588,7 @@ GameObject:
|
|||
- component: {fileID: 2965847692438137990}
|
||||
- component: {fileID: 8322628358676460453}
|
||||
- component: {fileID: 5454192440375255308}
|
||||
- component: {fileID: 2363537910218836323}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -8548,7 +8670,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -8566,12 +8688,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8230184370898043899}
|
||||
m_TargetGraphic: {fileID: 8322628358676460453}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &2363537910218836323
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6667212784372899036}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &6749777682169429009
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8662,6 +8803,7 @@ GameObject:
|
|||
- component: {fileID: 1817447885196626512}
|
||||
- component: {fileID: 60574620629345373}
|
||||
- component: {fileID: 3898682804065326915}
|
||||
- component: {fileID: 8154654518176004986}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -8743,7 +8885,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -8761,12 +8903,31 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8230184370898043899}
|
||||
m_TargetGraphic: {fileID: 60574620629345373}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &8154654518176004986
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6798976089914348476}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &6853163589154195148
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -9412,6 +9573,7 @@ GameObject:
|
|||
- component: {fileID: 1493813415071284517}
|
||||
- component: {fileID: 8230184370898043899}
|
||||
- component: {fileID: 4293490055400401015}
|
||||
- component: {fileID: 7539468177496810134}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
|
@ -9493,7 +9655,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 3
|
||||
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}
|
||||
|
@ -9517,6 +9679,25 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &7539468177496810134
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8402211400647155952}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &8444282254646497527
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -9734,7 +9915,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1350465337999593540}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
|
@ -48613,7 +48613,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 3.9999866, y: -14.8}
|
||||
m_SizeDelta: {x: 1017.6, y: 287.5}
|
||||
m_SizeDelta: {x: 900, y: 287.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4702983222103036063
|
||||
GameObject:
|
||||
|
@ -48653,7 +48653,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1017.6, y: 0}
|
||||
m_SizeDelta: {x: 609, y: 0}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &436736934794835867
|
||||
CanvasRenderer:
|
||||
|
@ -48696,9 +48696,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1.1
|
||||
m_Text: 'sdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsd
|
||||
|
||||
'
|
||||
m_Text: sdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsdsd
|
||||
LanguageIndex: 11582
|
||||
--- !u!114 &2040437044217117520
|
||||
MonoBehaviour:
|
||||
|
@ -48774,7 +48772,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -1791, y: 38}
|
||||
m_SizeDelta: {x: 1017.6, y: 0}
|
||||
m_SizeDelta: {x: 900, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &6339446887839225154
|
||||
MonoBehaviour:
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -6139,7 +6139,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 396.8, y: 714.3}
|
||||
m_SizeDelta: {x: 98.19, y: 98.19}
|
||||
m_SizeDelta: {x: 104, y: 104}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8615198845383106814
|
||||
CanvasRenderer:
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -757,7 +757,7 @@ RectTransform:
|
|||
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.000015258789}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000030517578}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &5343069358979546458
|
||||
|
@ -2448,7 +2448,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.41960785}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.9019608}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
@ -990,6 +990,8 @@ RedPointType = {
|
|||
YuJianXingMian = 870,--主界面
|
||||
YuJianXingTime = 8701,--次数
|
||||
YuJianXingRecord = 8702,--纪录
|
||||
--玉虚论道
|
||||
WorldArena_reward = 672, --玉虚论道奖励
|
||||
}
|
||||
|
||||
RedPointStatus = {
|
||||
|
@ -1088,10 +1090,10 @@ JumpType = {
|
|||
JumpServerHightLadder = 82,--灵兽山
|
||||
HongMengZhen = 86,-- 鸿蒙阵
|
||||
FightLevel = 107,-- 山河社稷图
|
||||
likeability = 114,
|
||||
YuXuLunDao= 111, --玉虚论道
|
||||
QiJieShiLian = 112,--七界试炼
|
||||
SiXiangXinFa = 113,--四象心法
|
||||
|
||||
likeability = 114,
|
||||
BuyVigor = 10000, --体力购买
|
||||
BuyGold = 10001, --金币购买
|
||||
Privilege = 10003, -- 特权
|
||||
|
@ -1761,6 +1763,7 @@ HELP_TYPE = {
|
|||
Likeability = 110,
|
||||
QiJieTreasure = 105,--七界秘宝
|
||||
QiJieShiLian = 106,--七界试炼
|
||||
YuXu = 107,--玉虚
|
||||
FourQuadrant=108,--四象心法
|
||||
YuJianXing=111,--御剑行
|
||||
}
|
||||
|
@ -2167,10 +2170,10 @@ RANK_TYPE = {
|
|||
JUMPSERVER_FORCE_CURR_RANK = 33,--跨服战力排行
|
||||
JUMPSERVER_MONSTER_RANK = 34,--跨服心魔排行
|
||||
JUMPSERVER_FIGHTLEVEL_STAR = 35,--跨服山河排行
|
||||
JUMPSERVER_GUILD_FORCE_RANK = 36,--跨服公会排行
|
||||
WORLDARENA=37, --玉虚论道排行榜
|
||||
JUMPSERVER_GUILD_FORCE_RANK = 36,--跨服公会排行 37也是玉虚论道再用
|
||||
PERSON_CHALLENGE = 38,--四灵试炼人排行
|
||||
QIJIESHILIAN_RANK = 39,--七界试炼排行榜
|
||||
WORLDARENA=40, --玉虚论道排行榜
|
||||
}
|
||||
|
||||
--东海寻仙弹窗类型
|
||||
|
@ -2924,4 +2927,4 @@ _ItemIdToVipPrivilege = {
|
|||
[14] = 1,
|
||||
[3] = 1,
|
||||
[17] = 27,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -207,7 +207,7 @@ local ManagerNames = {
|
|||
--七界试炼管理器
|
||||
"QiJieShiLian/QiJieShiLianManager",
|
||||
--玉虚论道管理器
|
||||
-- "WorldArena/WorldArenaManager",
|
||||
"WorldArena/WorldArenaManager",
|
||||
--秘宝管理器
|
||||
"GeneralPanel/GeneralTreasureMangaer",
|
||||
--御剑行管理器
|
||||
|
|
|
@ -159,6 +159,26 @@ function AddParticleSortLayer(go,layer)
|
|||
end
|
||||
end
|
||||
end
|
||||
function SetParticleSortLayer(go,layer)
|
||||
if layer==0 then
|
||||
return
|
||||
end
|
||||
local list=go.transform:GetComponentsInChildren(typeof(UnityEngine.Transform)):ToTable()
|
||||
for key, value in pairs(list) do
|
||||
local aaa=value
|
||||
local render=aaa:GetComponent(typeof(UnityEngine.Renderer))
|
||||
if render then
|
||||
render.sortingOrder=layer
|
||||
end
|
||||
local canvas=aaa:GetComponent(typeof(UnityEngine.Canvas))
|
||||
if canvas then
|
||||
canvas.sortingOrder=layer
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
function Util_SetToDefaultHeadImage(spLoader, image)
|
||||
if image == nil then
|
||||
return
|
||||
|
|
|
@ -92,6 +92,7 @@ TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
|
|||
TAKEARENABATTLEREWARDRESPONSE = protobuf.Descriptor();
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
CROSSYUXULUNDAOGETINFOREQUEST = protobuf.Descriptor();
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
CROSSYUXULUNDAOGETINFORESPONSE = protobuf.Descriptor();
|
||||
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD = protobuf.FieldDescriptor();
|
||||
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -957,11 +958,21 @@ TAKEARENABATTLEREWARDRESPONSE.enum_types = {}
|
|||
TAKEARENABATTLEREWARDRESPONSE.fields = {TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD}
|
||||
TAKEARENABATTLEREWARDRESPONSE.is_extendable = false
|
||||
TAKEARENABATTLEREWARDRESPONSE.extensions = {}
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.name = "type"
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest.type"
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.number = 1
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.index = 0
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.label = 1
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.has_default_value = false
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.default_value = 0
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.type = 5
|
||||
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.cpp_type = 1
|
||||
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.name = "CrossYuXuLunDaoGetInfoRequest"
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest"
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.nested_types = {}
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.enum_types = {}
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.fields = {}
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.fields = {CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD}
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.is_extendable = false
|
||||
CROSSYUXULUNDAOGETINFOREQUEST.extensions = {}
|
||||
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.name = "isFirst"
|
||||
|
|
|
@ -738,6 +738,8 @@ CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD = protobuf.FieldDescriptor();
|
|||
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD = protobuf.FieldDescriptor();
|
||||
CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD = protobuf.FieldDescriptor();
|
||||
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD = protobuf.FieldDescriptor();
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD = protobuf.FieldDescriptor();
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD = protobuf.FieldDescriptor();
|
||||
SIXIANGXINFAPROPERTYINFO = protobuf.Descriptor();
|
||||
SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
|
||||
SIXIANGXINFAPROPERTYINFO_PROPERTYNUM_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -7804,11 +7806,31 @@ CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.default_value = ""
|
|||
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.type = 9
|
||||
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.cpp_type = 9
|
||||
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.name = "yxldMyForce"
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.yxldMyForce"
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.number = 19
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.index = 18
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.label = 3
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.has_default_value = false
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.default_value = {}
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.type = 5
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.cpp_type = 1
|
||||
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.name = "yxldDefForce"
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.yxldDefForce"
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.number = 20
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.index = 19
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.label = 3
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.has_default_value = false
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.default_value = {}
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.type = 5
|
||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.cpp_type = 1
|
||||
|
||||
CROSSYXLDPLAYERRECORDINFO.name = "crossYxldPlayerRecordInfo"
|
||||
CROSSYXLDPLAYERRECORDINFO.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo"
|
||||
CROSSYXLDPLAYERRECORDINFO.nested_types = {}
|
||||
CROSSYXLDPLAYERRECORDINFO.enum_types = {}
|
||||
CROSSYXLDPLAYERRECORDINFO.fields = {CROSSYXLDPLAYERRECORDINFO_UID_FIELD, CROSSYXLDPLAYERRECORDINFO_LEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_HEAD_FIELD, CROSSYXLDPLAYERRECORDINFO_USERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_HEADFRAME_FIELD, CROSSYXLDPLAYERRECORDINFO_TIME_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA1_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA2_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA3_FIELD, CROSSYXLDPLAYERRECORDINFO_POWER_FIELD, CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD, CROSSYXLDPLAYERRECORDINFO_PRACTICELEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSCORECHANGE_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULTLIST_FIELD, CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD, CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD}
|
||||
CROSSYXLDPLAYERRECORDINFO.fields = {CROSSYXLDPLAYERRECORDINFO_UID_FIELD, CROSSYXLDPLAYERRECORDINFO_LEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_HEAD_FIELD, CROSSYXLDPLAYERRECORDINFO_USERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_HEADFRAME_FIELD, CROSSYXLDPLAYERRECORDINFO_TIME_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA1_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA2_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA3_FIELD, CROSSYXLDPLAYERRECORDINFO_POWER_FIELD, CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD, CROSSYXLDPLAYERRECORDINFO_PRACTICELEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSCORECHANGE_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULTLIST_FIELD, CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD, CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD}
|
||||
CROSSYXLDPLAYERRECORDINFO.is_extendable = false
|
||||
CROSSYXLDPLAYERRECORDINFO.extensions = {}
|
||||
SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD.name = "propertyId"
|
||||
|
|
|
@ -411,6 +411,7 @@ VIEWHEROINFORESPONSE_EQUIP_FIELD = protobuf.FieldDescriptor();
|
|||
VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD = protobuf.FieldDescriptor();
|
||||
VIEWHEROINFORESPONSE_FORCE_FIELD = protobuf.FieldDescriptor();
|
||||
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD = protobuf.FieldDescriptor();
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
RANKREQUEST = protobuf.Descriptor();
|
||||
RANKREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
RANKREQUEST_ACTIVITEID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -4398,11 +4399,21 @@ VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.default_value = 0
|
|||
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.type = 5
|
||||
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.cpp_type = 1
|
||||
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.name = "treeLevel"
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.full_name = ".rpc.protocols.ViewHeroInfoResponse.treeLevel"
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.number = 6
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.index = 5
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.label = 1
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.has_default_value = false
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.default_value = 0
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.type = 5
|
||||
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.cpp_type = 1
|
||||
|
||||
VIEWHEROINFORESPONSE.name = "ViewHeroInfoResponse"
|
||||
VIEWHEROINFORESPONSE.full_name = ".rpc.protocols.ViewHeroInfoResponse"
|
||||
VIEWHEROINFORESPONSE.nested_types = {}
|
||||
VIEWHEROINFORESPONSE.enum_types = {}
|
||||
VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD}
|
||||
VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD, VIEWHEROINFORESPONSE_TREELEVEL_FIELD}
|
||||
VIEWHEROINFORESPONSE.is_extendable = false
|
||||
VIEWHEROINFORESPONSE.extensions = {}
|
||||
RANKREQUEST_TYPE_FIELD.name = "type"
|
||||
|
|
|
@ -143,7 +143,7 @@ function BagResolveAnCompoundPanel:BindEvent()
|
|||
this.SendBackCompoundReCallBack(drop)
|
||||
end)
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[10183])
|
||||
PopupTipPanel.ShowTip(Language[10183])
|
||||
end
|
||||
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
|
||||
if compoundNum>0 then
|
||||
|
@ -308,8 +308,8 @@ function this.OnShowLayout3Data()
|
|||
compoundMaxNum=maxCompoundValue > gameSetting.HeroCompoundLimit and gameSetting.HeroCompoundLimit or maxCompoundValue
|
||||
endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
|
||||
compoundMaxNum=compoundMaxNum >endHeroNum and endHeroNum or compoundMaxNum
|
||||
if compoundMaxNum > 50 then
|
||||
compoundMaxNum = 50
|
||||
if compoundMaxNum > compoundMaxNum then
|
||||
compoundMaxNum = compoundMaxNum
|
||||
end
|
||||
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
|
||||
this.nameText.text=Language[10194]
|
||||
|
|
|
@ -8169,7 +8169,9 @@ local passivityList = {
|
|||
if not buff or buff.caster~=role or buff.type~=BuffName.Control then
|
||||
return
|
||||
end
|
||||
buff.target:AddBuff(Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[pro],v1, ct))
|
||||
if buff.target then
|
||||
buff.target:AddBuff(Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[pro],v1, ct))
|
||||
end
|
||||
end
|
||||
|
||||
local OnSkillCast=function(skill)
|
||||
|
|
|
@ -71,7 +71,7 @@ function ActivityMainPanel:CheckActOpen(_index)
|
|||
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType)
|
||||
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then
|
||||
if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then
|
||||
if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[_index].ActiveType == ActivityTypeDef.DynamicActShop then
|
||||
if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[_index].ActiveType == ActivityTypeDef.DynamicActShop or tabs[_index].ActiveType == ActivityTypeDef.NiuQi then
|
||||
_CurPageIndex = _index
|
||||
elseif GlobalActConfig[id].ShowArt == this.activityType then
|
||||
_CurPageIndex = _index
|
||||
|
@ -221,7 +221,7 @@ function this.PageTabAdapter(tab, index, status)
|
|||
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActiveType)
|
||||
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) then
|
||||
if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then
|
||||
if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[index].ActiveType == ActivityTypeDef.DynamicActShop then
|
||||
if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[index].ActiveType == ActivityTypeDef.DynamicActShop or tabs[index].ActiveType == ActivityTypeDef.NiuQi then
|
||||
isshow = true
|
||||
elseif GlobalActConfig[id].ShowArt == this.activityType then
|
||||
isshow = true
|
||||
|
|
|
@ -112,7 +112,15 @@ function QianKunBox:OnOpen(_activityConfig,_index,parent)
|
|||
self.parent = parent
|
||||
end
|
||||
|
||||
function QianKunBox:OnSortingOrderChange()
|
||||
function QianKunBox:OnSortingOrderChange(_sortingOrder)
|
||||
sortingOrder = _sortingOrder or 0
|
||||
Util.SetParticleSortLayer(self.effect, sortingOrder+1)
|
||||
Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder+1)
|
||||
for i = 1, 5 do
|
||||
if self.icons[i] and self.icons[i].effect then
|
||||
Util.SetParticleSortLayer(self.icons[i].effect.gameObject, sortingOrder+1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
|
|
|
@ -594,9 +594,16 @@ function this.SetRoleList(_roleDatas, isTop,isAni)
|
|||
else
|
||||
this.SortHeroDatas(_roleDatas)
|
||||
end
|
||||
|
||||
--刷新玉虚论道缓存的阵容数据
|
||||
if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then
|
||||
this.opView.RemoveTeamByIndex(this.curFormationIndex)
|
||||
for i,v in pairs(this.choosedList) do
|
||||
--LogError("刷新添加=== id=="..v.heroId.." pos=="..v.position)
|
||||
this.opView.AddHeroToTeam(v.heroId,v.position,this.curFormationIndex)
|
||||
end
|
||||
end
|
||||
|
||||
-- local curFormation = FormationManager.formationList[this.curFormationIndex]
|
||||
this.scrollView:SetData(_roleDatas, function(index, go)
|
||||
this.SingleHeroDataShow(go, _roleDatas[index])
|
||||
|
@ -775,9 +782,6 @@ function this.SingleHeroDataShow(_go, _heroData)
|
|||
for i,v in pairs(this.choosedList) do
|
||||
if(heroData.dynamicId==v.heroId) then
|
||||
choosedObj:SetActive(true)
|
||||
if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then
|
||||
this.opView.AddHeroToTeam(heroData.dynamicId,v.position,this.curFormationIndex)
|
||||
end
|
||||
end
|
||||
end
|
||||
if panelType == FORMATION_TYPE.WORLDARENA then
|
||||
|
|
|
@ -26,7 +26,7 @@ local switchFunc = function (type)
|
|||
this.curIndex = 1
|
||||
end
|
||||
else
|
||||
LogError("curindex==3")
|
||||
LogGreen("curindex==3")
|
||||
end
|
||||
else
|
||||
if this.curIndex ~= 1 then
|
||||
|
@ -36,10 +36,11 @@ local switchFunc = function (type)
|
|||
this.curIndex = 3
|
||||
end
|
||||
else
|
||||
LogError("curindex==1")
|
||||
LogGreen("curindex==1")
|
||||
end
|
||||
end
|
||||
this.ChangeTeamIndex(type)
|
||||
PopupTipPanel.ShowTip("已交换队伍顺序!")
|
||||
end
|
||||
|
||||
local isLeftOrRight=false
|
||||
|
@ -204,7 +205,7 @@ function this.ChangeHeroTeam(id,_index,_pos)
|
|||
for i = 1, #value.teamHeroInfos do
|
||||
if value.teamHeroInfos[i].heroId==id then
|
||||
hero=value.teamHeroInfos[i]
|
||||
LogError("从旧队伍里面移除 "..value.teamId)
|
||||
LogGreen("从旧队伍里面移除 "..value.teamId)
|
||||
table.removebyvalue(value.teamHeroInfos,value.teamHeroInfos[i])
|
||||
break
|
||||
end
|
||||
|
@ -214,7 +215,7 @@ function this.ChangeHeroTeam(id,_index,_pos)
|
|||
table.insert(currAllTeams[_index].teamHeroInfos,hero)
|
||||
allHeros[id].pos=_pos
|
||||
allHeros[id].index=_index
|
||||
LogError("添加到新队伍 ".._index)
|
||||
LogGreen("添加到新队伍 ".._index)
|
||||
end
|
||||
|
||||
--添加到队伍
|
||||
|
@ -231,7 +232,7 @@ function this.AddHeroToTeam(id,pos,index)
|
|||
end
|
||||
table.insert(currAllTeams[index].teamHeroInfos,{heroId=id,position=pos})
|
||||
if not allHeros[id] then
|
||||
LogError(" 新添加英雄=="..id)
|
||||
-- LogError(" 新添加英雄=="..id)
|
||||
allHeros[id]={Id=id,pos=pos,index=index}
|
||||
else
|
||||
allHeros[id].Id=id
|
||||
|
@ -310,13 +311,13 @@ function this.On_Btn2_Click()
|
|||
local twoTeam={}
|
||||
local threeTeam={}
|
||||
local allTeam={}
|
||||
|
||||
--检测三个队伍是否有重复英雄
|
||||
local len = 0
|
||||
for key, value in pairs(allHeros) do
|
||||
local newHero={}
|
||||
newHero.heroId=value.Id
|
||||
newHero.position=value.pos
|
||||
LogError(" id=="..value.Id.." posi=="..value.pos)
|
||||
if value.index==2001 then
|
||||
table.insert(oneTeam,newHero)
|
||||
elseif value.index==2002 then
|
||||
|
@ -342,13 +343,70 @@ function this.On_Btn2_Click()
|
|||
this.root:ClosePanel()
|
||||
end
|
||||
|
||||
--排序
|
||||
function this.SortHeroDatas()
|
||||
end
|
||||
|
||||
|
||||
-- 获取要显示得英雄列表
|
||||
function this.GetHeroList(proId)
|
||||
local first ={}
|
||||
local one = {}
|
||||
local two = {}
|
||||
local three = {}
|
||||
local four={}
|
||||
local currHeros = {}
|
||||
if not proId or proId==0 then
|
||||
return HeroManager.GetAllHeroDatas()
|
||||
currHeros=HeroManager.GetAllHeroDatas()
|
||||
else
|
||||
currHeros=HeroManager.GetHeroDataByProperty(proId)
|
||||
end
|
||||
return HeroManager.GetHeroDataByProperty(proId)
|
||||
table.sort(currHeros,function(a,b)
|
||||
return this.root.NaturalSort(true,a,b)
|
||||
end)
|
||||
local currIndex=this.GetFormationIndex()
|
||||
for i = 1,#currHeros do
|
||||
local hero = currHeros[i]
|
||||
if hero then
|
||||
if allHeros[hero.dynamicId] then
|
||||
local index = allHeros[hero.dynamicId].index
|
||||
if index==currIndex then
|
||||
table.insert(first,hero)
|
||||
else
|
||||
if index==2001 then
|
||||
table.insert(one,hero)
|
||||
elseif index==2002 then
|
||||
table.insert(two,hero)
|
||||
elseif index==2003 then
|
||||
table.insert(three,hero)
|
||||
end
|
||||
end
|
||||
else
|
||||
table.insert(four,hero)
|
||||
end
|
||||
end
|
||||
end
|
||||
local allHero = {}
|
||||
for i = 1, #first do
|
||||
table.insert(allHero,first[i])
|
||||
end
|
||||
for i = 1, #one do
|
||||
table.insert(allHero,one[i])
|
||||
end
|
||||
|
||||
for i = 1, #two do
|
||||
table.insert(allHero,two[i])
|
||||
end
|
||||
|
||||
for i = 1, #three do
|
||||
table.insert(allHero,three[i])
|
||||
end
|
||||
|
||||
for i = 1, #four do
|
||||
table.insert(allHero,four[i])
|
||||
end
|
||||
|
||||
return allHero
|
||||
end
|
||||
|
||||
-- 获取一键上阵所需要的英雄列表
|
||||
|
|
|
@ -118,8 +118,8 @@ function this:SetSingleData(index,item,data)
|
|||
local t2 = true
|
||||
local t3 = true
|
||||
--判断是否可以选择
|
||||
if PlayerManager.level >= data.LevelLimit then
|
||||
num.gameObject:SetActive(true)
|
||||
num.gameObject:SetActive(true)
|
||||
if PlayerManager.level >= data.LevelLimit then
|
||||
limit1.gameObject:SetActive(false)
|
||||
select:SetActive(true)
|
||||
else
|
||||
|
@ -128,7 +128,6 @@ function this:SetSingleData(index,item,data)
|
|||
t1 = false
|
||||
end
|
||||
if ActData.curLevel >= data.FloorLimit then
|
||||
num.gameObject:SetActive(true)
|
||||
limit2.gameObject:SetActive(false)
|
||||
select:SetActive(true)
|
||||
else
|
||||
|
@ -150,7 +149,6 @@ function this:SetSingleData(index,item,data)
|
|||
num.text = (data.InitializeNum - aData.progress).."/"..data.InitializeNum
|
||||
end
|
||||
|
||||
num.gameObject:SetActive(t1 and t2)
|
||||
select:SetActive(t1 and t2 and t3)
|
||||
|
||||
end
|
||||
|
|
|
@ -108,7 +108,7 @@ function this.InitMsg(msg)
|
|||
this.serData[id].restTime = restTime
|
||||
this.serData[id].switch = switch
|
||||
|
||||
LogGreen(string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s",id, startTime, endTime, switch))
|
||||
-- LogGreen(string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s",id, startTime, endTime, switch))
|
||||
|
||||
-- 用于标记是否解锁使用
|
||||
local typeId = AllActSetConfig[id].IsIDdSame
|
||||
|
|
|
@ -60,15 +60,15 @@ end
|
|||
|
||||
--绑定事件(用于子类重写)
|
||||
function GuildCarDelayMainPanel:BindEvent()
|
||||
Util.AddClick(this.BackBtn, function()
|
||||
Util.AddOnceClick(this.BackBtn, function()
|
||||
this:ClosePanel()
|
||||
end)
|
||||
--奖励排行
|
||||
Util.AddClick(this.rewardSortBtn, function()
|
||||
Util.AddOnceClick(this.rewardSortBtn, function()
|
||||
UIManager.OpenPanel(UIName.GuildCarDelayRewardSortPopup)
|
||||
end)
|
||||
--抢夺记录
|
||||
Util.AddClick(this.lootRecordBtn, function()
|
||||
Util.AddOnceClick(this.lootRecordBtn, function()
|
||||
NetManager.CarGrapRecordResponse(function (msg)
|
||||
--for i = 1, #msg.carChallengeItem do
|
||||
-- LogError("content "..msg.carChallengeItem[i].content)
|
||||
|
@ -77,7 +77,7 @@ function GuildCarDelayMainPanel:BindEvent()
|
|||
end)
|
||||
end)
|
||||
--挑战
|
||||
Util.AddClick(this.challengeBtn, function()
|
||||
Util.AddOnceClick(this.challengeBtn, function()
|
||||
if curProgress ~= 1 then
|
||||
PopupTipPanel.ShowTip(Language[11008])
|
||||
return
|
||||
|
@ -97,7 +97,7 @@ function GuildCarDelayMainPanel:BindEvent()
|
|||
end
|
||||
end)
|
||||
--抢夺
|
||||
Util.AddClick(this.lootBtn, function()
|
||||
Util.AddOnceClick(this.lootBtn, function()
|
||||
if curProgress ~= 3 then
|
||||
PopupTipPanel.ShowTip(Language[11011])
|
||||
return
|
||||
|
@ -118,11 +118,11 @@ function GuildCarDelayMainPanel:BindEvent()
|
|||
end
|
||||
end)
|
||||
--帮助按钮
|
||||
Util.AddClick(this.HelpBtn, function()
|
||||
Util.AddOnceClick(this.HelpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.GuildCarDelay,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
-- --boss详情
|
||||
-- Util.AddClick(this.live2dRoot, function()
|
||||
-- Util.AddOnceClick(this.live2dRoot, function()
|
||||
-- UIManager.OpenPanel(UIName.GuildCarDelayFindBossPopup)
|
||||
-- end)
|
||||
end
|
||||
|
|
|
@ -118,11 +118,18 @@ function this.GetHightLadderDataIsGroup()
|
|||
return isGroup ~= 0
|
||||
end
|
||||
function this.GetHightLadderDataIsStart()
|
||||
LogRed("isStart1:"..tostring(isStart))
|
||||
return isStart >= mServerArenaSetting[1].OpenWeek
|
||||
end
|
||||
function this.GetQiJieIsStart()
|
||||
LogRed("isStart3:"..tostring(isStart))
|
||||
return isStart >= mServerArenaSetting[3].OpenWeek
|
||||
end
|
||||
function this.GetYuxuIsStart()
|
||||
LogRed("isStart2:"..tostring(isStart))
|
||||
return isStart >= mServerArenaSetting[2].OpenWeek
|
||||
end
|
||||
|
||||
-- 获取剩余挑战次数 特权
|
||||
function this.GetCanBattleCount()
|
||||
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM)
|
||||
|
|
|
@ -25,13 +25,13 @@ local type = {
|
|||
sort = 3,
|
||||
bg = "r_Dungeon_rendi_01",
|
||||
name = "y_yuxulundao_yuxurukou_zh",
|
||||
live = "m_chsm_0035_png",
|
||||
livePos = Vector2(274.5, -408.1),
|
||||
liveSize = Vector2(1612, 1802),
|
||||
live = "lingjijuyuan",
|
||||
livePos = Vector2(149, 13),
|
||||
liveSize = Vector2(1024, 356),
|
||||
tipBg = "r_Dungeon_juqingdian",
|
||||
resetTime = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
|
||||
tip = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
|
||||
redPointType = RedPointType.JumpServer_HightLadder,
|
||||
redPointType = RedPointType.WorldArena_reward,
|
||||
tipStr = "",
|
||||
state = 0,
|
||||
},
|
||||
|
@ -167,8 +167,10 @@ function JumpServerPanel:BtnClick(id)
|
|||
end
|
||||
|
||||
if id == JumpServer_Type.YuXuLunDao then
|
||||
UIManager.OpenPanel(UIName.WorldArenaMainPanel)
|
||||
self:ClosePanel()
|
||||
NetManager.CrossYuXuLunDaoGetInfoRequest(1,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
if id == JumpServer_Type.QiJieShiLian then
|
||||
local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage)
|
||||
|
@ -245,9 +247,9 @@ function JumpServerPanel:SystemState(id,fun)
|
|||
end
|
||||
-- 跨服相关判断
|
||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
||||
if not JumpServerManager.GetYuxuIsStart() then
|
||||
type[id].state = -4
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek)
|
||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,2).OpenWeek)
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
type[id].state = -5
|
||||
type[id].tipStr = "未划分跨服分组,无法参与!"
|
||||
|
|
|
@ -677,7 +677,8 @@ function this.ExecuteLoading()
|
|||
--[[[47] =]]function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜
|
||||
--[[[48] =]]function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服
|
||||
--[[[49] =]]function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷
|
||||
--[[[50] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度
|
||||
--[[[50] =]]function() NetManager.CrossYuXuLunDaoGetInfoRequest(2,LoadingPanel.OnStep) end, --玉虚论道红点
|
||||
--[[[51] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度
|
||||
function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||
-- 登录成功确认
|
||||
NetManager.LoginConfimRequest()
|
||||
|
|
|
@ -87,7 +87,7 @@ function GMPanel:InitComponent()
|
|||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级魂灵宝", inputTip = {""}, callBack = this.Baowu},
|
||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级装备", inputTip = {""}, callBack = this.GetEquipe},
|
||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems},
|
||||
|
||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "鑫鹏的gm", inputTip = {""}, callBack = this.SendToXinPeng},
|
||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil},
|
||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe},
|
||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = "获取", inputTip = {"天宫秘宝积分"}, callBack = nil},
|
||||
|
@ -270,6 +270,12 @@ function this.GetManyHeros(text)
|
|||
end)
|
||||
end
|
||||
end
|
||||
|
||||
function this.SendToXinPeng()
|
||||
NetManager.GMEvent("26")
|
||||
end
|
||||
|
||||
|
||||
-- 设置孙龙积分
|
||||
function this.SetSunLongScroe(text)
|
||||
TreasureOfSomebodyManagerV2.SetCurrentLevel(tonumber(text))
|
||||
|
|
|
@ -5633,13 +5633,19 @@ function NetManager.TaiChuSecretvolumeRequest(func)
|
|||
end
|
||||
|
||||
--请求玉虚论道主界面信息
|
||||
function NetManager.CrossYuXuLunDaoGetInfoRequest(func)
|
||||
function NetManager.CrossYuXuLunDaoGetInfoRequest(_type,func)
|
||||
local data=ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoRequest()
|
||||
if _type==0 then
|
||||
data.type=0
|
||||
else
|
||||
data.type= tonumber(_type)
|
||||
end
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoGetInfoRequest, MessageTypeProto_pb.CrossYuXuLunDaoGetInfoResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoResponse()
|
||||
msg:ParseFromString(data)
|
||||
WorldArenaManager.SetRewardData(msg.dailyRewardState,msg.changedTimes)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
|
|
|
@ -8,26 +8,17 @@ local itemId = 0
|
|||
function this.Initialize()
|
||||
this.InitAllRewardData()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Mission.NiuQiChongTianTask,this.UpdateStatus)
|
||||
this.isOldNiuQiActivity = true
|
||||
this.IsNewActivity = false
|
||||
end
|
||||
|
||||
--服务器发来的活动进度条数据
|
||||
function this.GetActData()
|
||||
if this.isOldNiuQiActivity then
|
||||
return ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi)
|
||||
else
|
||||
return ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi)
|
||||
end
|
||||
return ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi)
|
||||
end
|
||||
|
||||
--牛气值
|
||||
function this.GetScore()
|
||||
local ActData = {}
|
||||
if this.isOldNiuQiActivity then
|
||||
ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi)
|
||||
else
|
||||
ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi)
|
||||
end
|
||||
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi)
|
||||
if not (ActData and ActData.activityId) then return end
|
||||
if #this.configData == 0 then
|
||||
local config = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActData.activityId)
|
||||
|
@ -73,6 +64,7 @@ function this.UpdateStatus()
|
|||
local temp = TaskManager.GetTypeTaskList(TaskTypeDef.NiuQiChongTian)
|
||||
for k,v in pairs(this.rewardData) do
|
||||
v.state = temp[v.id].state
|
||||
v.progress = temp[v.id].progress
|
||||
end
|
||||
CheckRedPointStatus(RedPointType.NiuQiChongTian_1)
|
||||
CheckRedPointStatus(RedPointType.NiuQiChongTian_2)
|
||||
|
@ -82,11 +74,15 @@ end
|
|||
function this.CreatSingleData(sData)
|
||||
local data = {}
|
||||
data.id = sData.Id
|
||||
data.actId = sData.ActivityId
|
||||
data.Text = sData.Text
|
||||
data.Reward = sData.Reward
|
||||
data.Sort = sData.Sort
|
||||
data.Type = sData.Type
|
||||
data.state = 0
|
||||
data.jumpId = sData.JumpID
|
||||
data.value = sData.ValuesII
|
||||
data.progress = 0
|
||||
return data
|
||||
end
|
||||
|
||||
|
@ -94,7 +90,7 @@ end
|
|||
--需要显示的任务数据
|
||||
function this.GetNeedRewardData(sort)
|
||||
local needData = {}
|
||||
if this.isOldNiuQiActivity then--老的牛气冲天
|
||||
if not this.IsNewActivity then--老的牛气冲天
|
||||
for i = 1, 2 do
|
||||
local tempdata = {}
|
||||
for k, v in pairs(this.rewardData) do
|
||||
|
@ -145,11 +141,16 @@ function this.GetNeedRewardData(sort)
|
|||
table.insert(needData,v)
|
||||
end
|
||||
end
|
||||
local STATE = {
|
||||
[0] = 2,
|
||||
[1] = 3,
|
||||
[2] = 1,
|
||||
}
|
||||
table.sort(needData,function (a,b)
|
||||
if a.state == b.state then
|
||||
return a.id < b.id
|
||||
else
|
||||
return a.state < b.state
|
||||
return STATE[a.state] > STATE[b.state]
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
@ -157,16 +158,15 @@ function this.GetNeedRewardData(sort)
|
|||
end
|
||||
|
||||
function this.CheckNiuQiChongTianRedPoint(index)
|
||||
local id = 0
|
||||
if this.isOldNiuQiActivity then
|
||||
id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuQi)
|
||||
else
|
||||
id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuQi)
|
||||
end
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuQi)
|
||||
if not id or id < 1 then
|
||||
return false
|
||||
end
|
||||
|
||||
for k = #this.rewardData, 1 , -1 do
|
||||
if this.rewardData[k].actId ~= id then
|
||||
table.remove( this.rewardData,k)
|
||||
end
|
||||
end
|
||||
local isShow = false
|
||||
if index == RedPointType.NiuQiChongTian_4 then
|
||||
isShow = this.NiuQiCheckRedPoint4()
|
||||
|
@ -203,4 +203,13 @@ function this.NiuQiCheckRedPoint4()
|
|||
return false
|
||||
end
|
||||
|
||||
--检查是否为新的牛气冲天
|
||||
function this.CheckIsNewActivity()
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuQi)
|
||||
local data = ConfigManager.GetConfigData(ConfigName.GlobalActivity,id)
|
||||
if data.ShowArt == 2 then
|
||||
this.IsNewActivity = true
|
||||
end
|
||||
end
|
||||
|
||||
return this
|
|
@ -11,9 +11,9 @@ function NiuQiChongTianPanel:New(gameObject)
|
|||
return b
|
||||
end
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12251] ,rpType = RedPointType.NiuQiChongTian_1},
|
||||
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12252] ,rpType = RedPointType.NiuQiChongTian_2},
|
||||
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12253] ,rpType = RedPointType.NiuQiChongTian_3},}
|
||||
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12251] , nameNew = "神将招募" ,rpType = RedPointType.NiuQiChongTian_1},
|
||||
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12252] , nameNew = "神将升星" ,rpType = RedPointType.NiuQiChongTian_2},
|
||||
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12253] , nameNew = "极速探索" ,rpType = RedPointType.NiuQiChongTian_3},}
|
||||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
|
||||
|
||||
|
@ -49,6 +49,7 @@ function NiuQiChongTianPanel:InitComponent()
|
|||
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform,self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0,0))
|
||||
self.ScrollView.moveTween.MomentumAmount = 1
|
||||
self.ScrollView.moveTween.Strength = 2
|
||||
self.ScrollView.elastic = false
|
||||
|
||||
self.effect5 = Util.GetGameObject(self.reward, "icon (5)/UI_Effect_jinkuang_Yuan")
|
||||
Util.SetParticleSortLayer(self.effect5, 1)
|
||||
|
@ -77,11 +78,7 @@ end
|
|||
--界面打开时调用(用于子类重写)
|
||||
function NiuQiChongTianPanel:OnOpen(_activityConfig,_index,parent)
|
||||
self.actConfig = _activityConfig
|
||||
if self.actConfig.ActiveType == ActivityTypeDef.NiuQi then
|
||||
NiuQiChongTianManager.isOldNiuQiActivity = true
|
||||
else
|
||||
NiuQiChongTianManager.isOldNiuQiActivity = false
|
||||
end
|
||||
NiuQiChongTianManager.CheckIsNewActivity()
|
||||
self.pageIndex = _index
|
||||
self.parent = parent
|
||||
end
|
||||
|
@ -117,7 +114,7 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder)
|
|||
self.redPointList[_TabData[index].rpType] = redPoint
|
||||
end
|
||||
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status])
|
||||
tabLab:GetComponent("Text").text = _TabData[index].name
|
||||
tabLab:GetComponent("Text").text = NiuQiChongTianManager.IsNewActivity and _TabData[index].nameNew or _TabData[index].name
|
||||
tabLab:GetComponent("Text").color = _TabFontColor[status]
|
||||
end
|
||||
|
||||
|
@ -222,6 +219,7 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data)
|
|||
local rewardList = Util.GetGameObject(go, "rewardList")
|
||||
local grid = Util.GetGameObject(go, "rewardList")
|
||||
local shadow = Util.GetGameObject(go, "shadow")
|
||||
local progress = Util.GetGameObject(go, "progress"):GetComponent("Text")
|
||||
|
||||
local shows = data.Reward
|
||||
title.text = GetLanguageStrById(data.Text)
|
||||
|
@ -229,6 +227,12 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data)
|
|||
btn.interactable = data.state ~= 2
|
||||
btnImg.sprite = self.spLoader:LoadSprite(BtnState[data.state].ImgName)
|
||||
btnText.text = BtnState[data.state].Text
|
||||
if data.state == 0 then
|
||||
progress.gameObject:SetActive(true)
|
||||
progress.text = string.format( "%s/%s",data.progress,data.value[2][1])
|
||||
else
|
||||
progress.gameObject:SetActive(false)
|
||||
end
|
||||
--滚动条复用重设itemview
|
||||
if self.itemsGrid[go] then
|
||||
for i = 1, 4 do
|
||||
|
@ -260,7 +264,7 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data)
|
|||
|
||||
Util.AddOnceClick(btn.gameObject,function ()
|
||||
if data.state == 0 then
|
||||
JumpManager.GoJump(1023)
|
||||
JumpManager.GoJump(data.jumpId)
|
||||
elseif data.state == 1 then
|
||||
NetManager.TakeMissionRewardRequest(TaskTypeDef.NiuQiChongTian,data.id,function (msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
||||
|
|
|
@ -799,6 +799,13 @@ local jumpDic = {
|
|||
end)
|
||||
end)
|
||||
end,
|
||||
[JumpType.YuXuLunDao] = function(data)
|
||||
QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.JumpServer_YuXu,2,function ()
|
||||
NetManager.CrossYuXuLunDaoGetInfoRequest(1,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
|
||||
end)
|
||||
end)
|
||||
end,
|
||||
[JumpType.linglongBaojing] = function(data)
|
||||
this.JumpActivity(JumpType.linglongBaojing % 10000,data[1])
|
||||
end,
|
||||
|
|
|
@ -305,7 +305,8 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.DailyRecharge,RedPointType.RightUp2)
|
||||
--七界试炼
|
||||
RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity)
|
||||
|
||||
--玉虚论道
|
||||
RPData:SetParent(RedPointType.WorldArena_reward, RedPointType.JumpServer_MainCity)
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
|
||||
if v.RpType > 0 and v.RpTypeParent > 0 then
|
||||
RPData:SetParent(v.RpType,v.RpTypeParent)
|
||||
|
@ -572,6 +573,8 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu)
|
||||
--七界试炼
|
||||
RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint,FUNCTION_OPEN_TYPE.QIJIESHILIAN)
|
||||
--玉虚论道
|
||||
RPData:AddCheckFunc(RedPointType.WorldArena_reward,WorldArenaManager.CheckRewardPoint)
|
||||
RPData:AddCheckFunc(RedPointType.LikeabilityRed,LikabilityManager.CheckRedPot)
|
||||
--御剑行
|
||||
RPData:AddCheckFunc(RedPointType.YuJianXingMian,YuJianXingManager.CheckRedPoint)
|
||||
|
|
|
@ -188,7 +188,7 @@ function this.SetRankingInfo(isTop, isAnim)
|
|||
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1 }
|
||||
elseif sData.rankType==RANK_TYPE.WORLDARENA then
|
||||
--rankingData.crossScore
|
||||
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1,crossScore=WorldArenaManager.GetNewScore()}
|
||||
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1,crossScore=myRankData.param2}
|
||||
elseif sData.rankType == RANK_TYPE.FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK then--战力排行
|
||||
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||
|
||||
|
@ -314,7 +314,9 @@ function this.SetHeadsInfo(data,root,index,name,level)
|
|||
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil)
|
||||
elseif sData.rankType == RANK_TYPE.WORLDARENA then--玉虚论道
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, data.uid,2)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(data.uid,0,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel,data.uid,2,msg)
|
||||
end)
|
||||
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.NORMAL,data.serverName and data.serverName or nil)
|
||||
else
|
||||
|
@ -357,7 +359,9 @@ function this.AddPlayerInfoClick(root,uid,serverName)
|
|||
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,serverName and serverName or nil)
|
||||
elseif sData.rankType == RANK_TYPE.WORLDARENA then
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(uid,0,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel,uid,2,msg)
|
||||
end)
|
||||
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.NORMAL,serverName and serverName or nil)
|
||||
else
|
||||
|
|
|
@ -19,6 +19,8 @@ local isAnim = false
|
|||
local _CloseFunc = nil
|
||||
local leftAllTeam={}
|
||||
local rightAllTeam={}
|
||||
local myOldScore=0
|
||||
local enOldScore=0
|
||||
local function OnBeginDrag(self, Pointgo, data)
|
||||
if state~=1 then
|
||||
return
|
||||
|
@ -80,6 +82,10 @@ local function OnEndDrag(self, Pointgo, data)
|
|||
targetInfo.transform.localPosition=Vector3.New(0,-67,0)
|
||||
else
|
||||
LogError("targetInfo==nil")
|
||||
local target=Util.GetGameObject(self.tempInfo.transform, "Demons")
|
||||
target.transform:SetParent(self.oldGrid.transform)
|
||||
target.transform:SetSiblingIndex(1)
|
||||
target.transform.localPosition=Vector3.New(0,-67,0)
|
||||
return
|
||||
end
|
||||
|
||||
|
@ -134,6 +140,7 @@ function WorldArenaBattleInfoPanel:InitComponent()
|
|||
this.enTeamInfo=Util.GetGameObject(self.transform, "BG/enInfo")
|
||||
this.effect=Util.GetGameObject(self.transform, "BG/Effect")
|
||||
this.effect:SetActive(false)
|
||||
this.hintTxt=Util.GetGameObject(self.transform, "BG/hintTxt"):GetComponent("Text")
|
||||
screenAdapte(this.effect)
|
||||
--我方阵营
|
||||
this.leftTeam={}
|
||||
|
@ -185,17 +192,23 @@ end
|
|||
|
||||
--刷新战斗消耗信息
|
||||
function this.RefreshBattleCastInfo()
|
||||
local leftTimes = WorldArenaManager.GetFreeTime()
|
||||
this.btnText.gameObject:SetActive(leftTimes > 0)
|
||||
this.btnItem.gameObject:SetActive(leftTimes<=0)
|
||||
this.btnItemNum.gameObject:SetActive(leftTimes<=0)
|
||||
if leftTimes<=0 then
|
||||
local itemId, needNum = WorldArenaManager.GetArenaChallengeCost()
|
||||
local haveNum = BagManager.GetItemCountById(itemId)
|
||||
this.btnItem.sprite = SetIcon(this.spLoader, itemId)
|
||||
this.btnItemNum.text = "×"..needNum
|
||||
this.btnItemNum.color = haveNum < needNum and UIColor.NOT_ENOUGH_RED or UIColor.BTN_TEXT
|
||||
if type==1 then
|
||||
local leftTimes = WorldArenaManager.GetFreeTime()
|
||||
this.btnText.gameObject:SetActive(leftTimes > 0)
|
||||
this.btnItem.gameObject:SetActive(leftTimes<=0)
|
||||
this.btnItemNum.gameObject:SetActive(leftTimes<=0)
|
||||
if leftTimes<=0 then
|
||||
local itemId, needNum = WorldArenaManager.GetArenaChallengeCost()
|
||||
local haveNum = BagManager.GetItemCountById(itemId)
|
||||
this.btnItem.sprite = SetIcon(this.spLoader, itemId)
|
||||
this.btnItemNum.text = "×"..needNum
|
||||
this.btnItemNum.color = haveNum < needNum and UIColor.NOT_ENOUGH_RED or UIColor.BTN_TEXT
|
||||
end
|
||||
else
|
||||
this.btnText.gameObject:SetActive(true)
|
||||
this.btnItem.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function WorldArenaBattleInfoPanel:PlayFightAnim(leftList, rightList, num, func)
|
||||
|
@ -233,6 +246,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
end)
|
||||
Util.AddClick(this.btn_fight, function()
|
||||
-- 动画中不能再执行
|
||||
state=2
|
||||
if isAnim then
|
||||
return
|
||||
end
|
||||
|
@ -258,7 +272,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
local haveNum = BagManager.GetItemCountById(itemId)
|
||||
if haveNum < needNum then
|
||||
--UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.yuxulundaoTicket })
|
||||
PopupTipPanel.ShowTip("邀请函不足!")
|
||||
PopupTipPanel.ShowTip("挑战券不足!")
|
||||
return
|
||||
end
|
||||
end
|
||||
|
@ -268,6 +282,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
isAnim = true
|
||||
self:PlayFightAnim(this.leftTeam, this.rightTeam, 3, function(index)
|
||||
this.ShowBattleState(index,3)
|
||||
state=2
|
||||
this.playBacks[index]:SetActive(true)
|
||||
if index >= 3 then
|
||||
isAnim = false
|
||||
|
@ -280,9 +295,11 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
end)
|
||||
this.myScore.gameObject:SetActive(true)
|
||||
this.enScore.gameObject:SetActive(true)
|
||||
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
|
||||
this.myScore.text= msg.myScore>0 and "积分 "..myOldScore .."+"..msg.myScore or "积分 "..myOldScore .." "..msg.myScore
|
||||
this.enScore.text= msg.defScore>0 and "积分 "..enOldScore .."+"..msg.defScore or "积分 "..enOldScore .." "..msg.defScore
|
||||
-- this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
|
||||
this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED
|
||||
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
|
||||
--this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
|
||||
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
|
||||
WorldArenaManager.SetNewScore(msg.myNewScore)
|
||||
WorldArenaManager.SetMyData(msg.myRank,WorldArenaManager.GetchallengeTimes()+1)
|
||||
|
@ -300,8 +317,11 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
|
||||
--回放按钮点击事件
|
||||
for i = 1, #this.playBacks do
|
||||
|
||||
Util.AddClick(this.playBacks[i],function()
|
||||
|
||||
if state==2 then
|
||||
return
|
||||
end
|
||||
if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then
|
||||
PopupTipPanel.ShowTip("本场战斗无法回放!")
|
||||
return
|
||||
|
@ -316,13 +336,13 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
|||
arg.result = realResult
|
||||
arg.blue = {}
|
||||
arg.blue.uid = myInfoData.uid
|
||||
arg.blue.name = myInfoData.name
|
||||
arg.blue.name =PracticeManager.SetNameColor(myInfoData.name,myInfoData.practiceLevel) --myInfoData.name
|
||||
arg.blue.head = myInfoData.head
|
||||
arg.blue.frame = myInfoData.headFrame
|
||||
arg.blue.deltaScore = myInfoData.myScoreChange
|
||||
arg.red= {}
|
||||
arg.red.uid = enInfoData.uid
|
||||
arg.red.name = enInfoData.name
|
||||
arg.red.name =PracticeManager.SetNameColor(enInfoData.name,enInfoData.practiceLevel)--enInfoData.name
|
||||
arg.red.head = enInfoData.head
|
||||
arg.red.frame = enInfoData.headFrame
|
||||
arg.red.deltaScore = enInfoData.myScoreChange
|
||||
|
@ -376,15 +396,19 @@ function WorldArenaBattleInfoPanel:OnOpen(msg,_type,closeFunc,list)
|
|||
if list then
|
||||
state=3
|
||||
resultList=list
|
||||
else
|
||||
state=1
|
||||
end
|
||||
if state==1 then
|
||||
for i = 1, 3 do
|
||||
this.playBacks[i]:SetActive(false)
|
||||
this.ShowBattleState(i, state)
|
||||
end
|
||||
this.myScore.gameObject:SetActive(false)
|
||||
this.enScore.gameObject:SetActive(false)
|
||||
--this.myScore.gameObject:SetActive(false)
|
||||
--this.enScore.gameObject:SetActive(false)
|
||||
this.hintTxt.gameObject:SetActive(true)
|
||||
elseif state==3 then
|
||||
this.hintTxt.gameObject:SetActive(false)
|
||||
this.myScore.gameObject:SetActive(true)
|
||||
this.enScore.gameObject:SetActive(true)
|
||||
for i = 1, 3 do
|
||||
|
@ -450,10 +474,22 @@ function this.ShowInfo(msg)
|
|||
end
|
||||
end
|
||||
if state==3 then
|
||||
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
|
||||
if type==1 then
|
||||
this.myScore.text= msg.myScore>0 and "积分 "..msg.myTeamInfo.crossTeamScore .."+"..msg.myScore or "积分 "..msg.myTeamInfo.crossTeamScore .." "..msg.myScore
|
||||
this.enScore.text= msg.defScore>0 and "积分 "..msg.defTeamInfo.crossTeamScore .."+"..msg.defScore or "积分 "..msg.defTeamInfo.crossTeamScore .." "..msg.defScore
|
||||
else
|
||||
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
|
||||
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
|
||||
end
|
||||
this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED
|
||||
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
|
||||
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
|
||||
else
|
||||
myOldScore=msg.myTeamInfo.crossTeamScore
|
||||
this.myScore.text="积分 "..myOldScore
|
||||
enOldScore=msg.defTeamInfo.crossTeamScore
|
||||
this.enScore.text="积分 "..enOldScore
|
||||
this.myScore.color =Color.New(0.9019,0.76,0.3882,1)
|
||||
this.enScore.color = Color.New(0.9019,0.76,0.3882,1)
|
||||
end
|
||||
this.SetTeamInfo(this.myTeamInfo,msg.myTeamInfo.crossTeam,1)
|
||||
this.SetTeamInfo(this.enTeamInfo,msg.defTeamInfo.crossTeam,2)
|
||||
|
@ -476,7 +512,8 @@ function this.ShowBattleState(index,state)
|
|||
rightImg.sprite=this.spLoader:LoadSprite("UI_effect_JJC_JieSuan_ShengLi_png_zh")
|
||||
end
|
||||
end
|
||||
|
||||
leftImg:GetComponent("PlayFlyAnim"):PlayAnim(true)
|
||||
rightImg:GetComponent("PlayFlyAnim"):PlayAnim(true)
|
||||
--end
|
||||
end
|
||||
|
||||
|
@ -489,7 +526,8 @@ function this.SetTeamInfo(_go,teamData,type)
|
|||
for index = 1, 3 do
|
||||
local go = Util.GetGameObject(_go,"defendbox"..index)
|
||||
local data = teamData[index]
|
||||
local fightTxt=Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text")
|
||||
local fightTxt=Util.GetGameObject(go,"Demons/WarPower/Text"):GetComponent("Text")
|
||||
fightTxt.text=tostring(data.totalForce)
|
||||
local teamList ={}
|
||||
for i = 1, 6 do
|
||||
local aa=Util.GetGameObject(go,"Demons/heroPro ("..i..")")
|
||||
|
|
|
@ -77,7 +77,7 @@ function WorldArenaMainPanel:BindEvent()
|
|||
for i, enemy in ipairs(this.Enemys) do
|
||||
local challengeBtn = Util.GetGameObject(enemy, "challenge")
|
||||
Util.AddClick(challengeBtn, function()
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
|
||||
PopupTipPanel.ShowTip(Language[10075])
|
||||
return
|
||||
end
|
||||
|
@ -107,7 +107,7 @@ function WorldArenaMainPanel:BindEvent()
|
|||
end
|
||||
--排行
|
||||
Util.AddClick(this.sortBtn, function()
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[27])
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[31])
|
||||
end)
|
||||
-- 刷新按钮
|
||||
this._RefreshTimeStemp=0
|
||||
|
@ -141,7 +141,7 @@ function WorldArenaMainPanel:BindEvent()
|
|||
end)
|
||||
-- 奖励按钮
|
||||
Util.AddClick(this.RewardBtn, function()
|
||||
UIManager.OpenPanel(UIName.WorldArenaRankRewardPanel,myRank)
|
||||
UIManager.OpenPanel(UIName.WorldArenaRankRewardPanel,WorldArenaManager.GetMyRank())
|
||||
end)
|
||||
--商店按钮
|
||||
Util.AddClick(this.StoreBtn, function()
|
||||
|
@ -180,10 +180,15 @@ end
|
|||
local grid, rankData
|
||||
--界面打开时调用(用于子类重写)
|
||||
local oldScore
|
||||
function WorldArenaMainPanel:OnOpen(...)
|
||||
function WorldArenaMainPanel:OnOpen(msg)
|
||||
-- 参数保存
|
||||
local args = {...}
|
||||
NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
|
||||
-- NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
|
||||
local isReset=false
|
||||
if msg.isFirst then
|
||||
isReset=true
|
||||
FormationManager.RefreshFormationData(this.CheckTeamDamage)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",msg.oldMyscore)
|
||||
end
|
||||
local currRankId=msg.newLevelId
|
||||
LogError(" newMyscore=="..msg.newMyscore.." oldmyscore=="..msg.oldMyscore)
|
||||
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
|
||||
|
@ -192,7 +197,7 @@ function WorldArenaMainPanel:OnOpen(...)
|
|||
if msg.drop and #msg.drop>0 then
|
||||
LogError("有充值奖励")
|
||||
WorldArenaManager.AddReward(msg.drop)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",0)
|
||||
|
||||
end
|
||||
myRank=msg.myRank
|
||||
rewardState=msg.dailyRewardState
|
||||
|
@ -216,11 +221,9 @@ function WorldArenaMainPanel:OnOpen(...)
|
|||
LogError("有升级奖励")
|
||||
WorldArenaManager.AddReward(msg.updrop)
|
||||
end
|
||||
this.CheckIsRankChange(msg.updrop)
|
||||
if msg.isFirst then
|
||||
FormationManager.RefreshFormationData()
|
||||
end
|
||||
end)
|
||||
this.CheckIsRankChange(isReset)
|
||||
|
||||
-- end)
|
||||
end
|
||||
|
||||
|
||||
|
@ -236,7 +239,7 @@ function this.SetStarShow(grade,layer)
|
|||
titleLive.transform:SetParent(this.rankPar.transform)
|
||||
titleLive.transform.localPosition=Vector3.New(0,-600,0)
|
||||
titleLive.transform.localScale =Vector3.New(1,1,1)
|
||||
AddParticleSortLayer(titleLive,layer)
|
||||
SetParticleSortLayer(titleLive,layer)
|
||||
this.rankName.text=rankData.RankName
|
||||
--this.RefreshEnemyData()
|
||||
this.ShowRewardBoxProgressData()
|
||||
|
@ -284,8 +287,9 @@ function this.ShowRewardBoxProgressData()
|
|||
NetManager.CrossYuXuLunDaoGetDailyRewardRequest(i, function(msg)
|
||||
allBoxGetState[i]=2
|
||||
--this.ShowRewardBoxProgressData()
|
||||
WorldArenaManager.SetRewardState(i,2)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function ()
|
||||
CheckRedPointStatus(RedPointType.Arena_Reward)
|
||||
CheckRedPointStatus(RedPointType.WorldArena_reward)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
@ -347,12 +351,13 @@ function this:RefreshEnemyData(team)
|
|||
this.HeadList[i]:SetFrame(EnemyList[i].headFrame)
|
||||
this.HeadList[i]:SetLevel(EnemyList[i].level)
|
||||
this.HeadList[i]:SetScale(Vector3.one*0.8)
|
||||
this.HeadList[i]:SetLayer(this.sortingOrder)
|
||||
this.HeadList[i]:SetLayer(self.sortingOrder)
|
||||
this.HeadList[i]:SetEffectScale(0.85)
|
||||
table.insert(enemyList,EnemyList[i].uid)
|
||||
Util.AddOnceClick(bg, function()
|
||||
LogError("uid=="..EnemyList[i].uid)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(EnemyList[i].uid,0,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1,msg)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
@ -390,8 +395,11 @@ function this.CheckIsRankChange(resetData)
|
|||
local lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore")
|
||||
LogError("lastscore=="..lastScore)
|
||||
local aa,oldData=WorldArenaManager.GetRankImgByScore(lastScore)
|
||||
--如果有段位变化就显示段位变化界面
|
||||
if oldData.Id~=rankData.Id then
|
||||
UIManager.OpenPanel(UIName.WorldArenaUpRewardPanel,resetData)
|
||||
else--如果没有段位变化就把最新的记录
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",WorldArenaManager.GetNewScore())
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -399,27 +407,38 @@ end
|
|||
-- 打开,重新打开时回调
|
||||
function WorldArenaMainPanel:OnShow()
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Arena)
|
||||
this.CheckTeamDamage()
|
||||
end
|
||||
|
||||
function WorldArenaMainPanel.CheckTeamDamage()
|
||||
local allDamage=0
|
||||
for i = 2001, 2003 do
|
||||
allDamage=allDamage+FormationManager.GetFormationPower(i)
|
||||
end
|
||||
this.power.text=allDamage
|
||||
|
||||
|
||||
this.power.text=allDamage
|
||||
end
|
||||
|
||||
function WorldArenaMainPanel:OnSortingOrderChange()
|
||||
|
||||
function WorldArenaMainPanel:OnSortingOrderChange(order)
|
||||
--this.sortingOrder=order
|
||||
if titleLive then
|
||||
SetParticleSortLayer(titleLive,self.sortingOrder)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function WorldArenaMainPanel:OnClose()
|
||||
|
||||
CheckRedPointStatus(RedPointType.WorldArena_reward)
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function WorldArenaMainPanel:OnDestroy()
|
||||
SubUIManager.Close(this.UpView)
|
||||
if titleLive then
|
||||
destroy(titleLive)
|
||||
titleLive=nil
|
||||
end
|
||||
-- 清除红点
|
||||
-- ClearRedPointObject(RedPointType.Arena_Shop)
|
||||
this.spLoader:Destroy()
|
||||
|
|
|
@ -7,6 +7,7 @@ local oldScore=0
|
|||
local newScore=0
|
||||
local myRankId=0
|
||||
local challengeTime=0
|
||||
local rewardState = nil
|
||||
local rewardList={}
|
||||
function this.Initialize()
|
||||
rewardList={}
|
||||
|
@ -45,6 +46,20 @@ function this.SetMyData(rank,time)
|
|||
challengeTime=time
|
||||
end
|
||||
|
||||
function this.GetMyRank()
|
||||
return myRankId
|
||||
end
|
||||
|
||||
|
||||
function this.SetRewardData(data,time)
|
||||
rewardState=data
|
||||
challengeTime=time
|
||||
for i = 1, #data do
|
||||
LogError("宝箱状态========"..data[1])
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function this.SetOldScore(num)
|
||||
oldScore=num
|
||||
end
|
||||
|
@ -87,7 +102,7 @@ end
|
|||
--根据积分获取段位图标id
|
||||
function this.GetRankImgByScore(num)
|
||||
for k, v in ConfigPairs(rankConfig) do
|
||||
if v.ScoreLow<num and v.ScoreUp>=num then
|
||||
if num>=v.ScoreLow and num<=v.ScoreUp then
|
||||
return v.RankGrade+1,v
|
||||
end
|
||||
end
|
||||
|
@ -109,4 +124,25 @@ function this.SetStarShow(starList, starLv)
|
|||
end
|
||||
end
|
||||
|
||||
--设置奖励状态
|
||||
function this.SetRewardState(index,state)
|
||||
if rewardState[index] then
|
||||
rewardState[index]=state
|
||||
end
|
||||
end
|
||||
--检测玉虚奖励的红点
|
||||
function this.CheckRewardPoint()
|
||||
local config=ConfigManager.GetConfigDataByKey(ConfigName.MServerRankConfig,1)
|
||||
local rewards=config.DailyReward
|
||||
for i = 1, #rewards do
|
||||
if rewards[i] then
|
||||
if challengeTime>=rewards[i][1] and rewardState[i]~=2 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
return this
|
|
@ -147,12 +147,14 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
|||
|
||||
for i, demon in ipairs(self.Heros[index]) do
|
||||
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))
|
||||
Util.GetGameObject(demon, "pos"):GetComponent("Image").sprite=self.spLoader:LoadSprite("bd_xinkapaifan"..i)
|
||||
Util.GetGameObject(demon, "hero"):SetActive(false)
|
||||
end
|
||||
local allPower=0
|
||||
--队伍阵容
|
||||
for i, hero in pairs(data) do
|
||||
local heroTid = data[i].heroId
|
||||
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
|
||||
if heroTid then
|
||||
local heroGo = Util.GetGameObject(self.Heros[index][hero.position], "hero")
|
||||
local heroData=HeroManager.GetSingleHeroData(heroTid)
|
||||
|
@ -164,18 +166,10 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
|||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
|
||||
Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||
SetHeroIcon(self.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
|
||||
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
|
||||
|
||||
local heroData = {}
|
||||
Util.AddOnceClick(frameBtn, function()
|
||||
LogError("playerid=="..PlayerManager.uid.." heroid=="..hero.heroId.." servername=="..1 .." arrayid=="..2000+index)
|
||||
-- NetManager.ViewHeroInfoRequest(PlayerManager.uid,hero.heroId,1,2000+index,function(msg)
|
||||
-- if not hero.heroid then
|
||||
-- return
|
||||
-- end
|
||||
-- heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
|
||||
-- GoodFriendManager.InitEquipData(msg.equip,heroData)
|
||||
-- UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
|
||||
-- end)
|
||||
Util.AddOnceClick(Util.GetGameObject(heroGo, "icon"), function()
|
||||
|
||||
local heroData = HeroManager.GetSingleHeroData(hero.heroId)
|
||||
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,false)
|
||||
end)
|
||||
|
|
|
@ -7,6 +7,7 @@ local itemId, needNum
|
|||
local haveNum=0
|
||||
local time=0
|
||||
local enemyId
|
||||
local curMsg=nil
|
||||
function WorldArenaOtherTeamPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.btnBack = Util.GetGameObject(self.gameObject, "Frame/other/BackBtn")
|
||||
|
@ -61,7 +62,7 @@ function WorldArenaOtherTeamPanel:BindEvent()
|
|||
end)
|
||||
Util.AddClick(self.btnChallenge, function()
|
||||
if time==0 and haveNum<needNum then
|
||||
PopupTipPanel.ShowTip("邀请函不足!")
|
||||
PopupTipPanel.ShowTip("挑战券不足!")
|
||||
return
|
||||
end
|
||||
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,self.playerId,function(msg)
|
||||
|
@ -83,9 +84,10 @@ function WorldArenaOtherTeamPanel:RemoveListener()
|
|||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function WorldArenaOtherTeamPanel:OnOpen(_playerId,_type)
|
||||
function WorldArenaOtherTeamPanel:OnOpen(_playerId,_type,_msg)
|
||||
self.playerId = _playerId
|
||||
type=_type
|
||||
curMsg=_msg
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
|
@ -112,11 +114,11 @@ end
|
|||
|
||||
function WorldArenaOtherTeamPanel:Refresh()
|
||||
LogError("self.playerid=="..self.playerId)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg)
|
||||
WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,msg.teamInfo)
|
||||
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{msg.teamInfo.crossTeam[1],msg.teamInfo.crossTeam[2],msg.teamInfo.crossTeam[3]})
|
||||
WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,msg.teamInfo.crossTeam[1].PokemonInfos)
|
||||
WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,msg.teamInfo.crossTeam[1].sealShow)
|
||||
--NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg)
|
||||
WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,curMsg.teamInfo)
|
||||
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{curMsg.teamInfo.crossTeam[1],curMsg.teamInfo.crossTeam[2],curMsg.teamInfo.crossTeam[3]})
|
||||
WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,curMsg.teamInfo.crossTeam[1].PokemonInfos)
|
||||
WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,curMsg.teamInfo.crossTeam[1].sealShow)
|
||||
if type==1 then
|
||||
self.btnChallenge:SetActive(true)
|
||||
else
|
||||
|
@ -125,7 +127,7 @@ function WorldArenaOtherTeamPanel:Refresh()
|
|||
|
||||
ForceRebuildLayout(self.content.transform)
|
||||
ForceRebuildLayout(self.Frame.transform)
|
||||
end)
|
||||
--end)
|
||||
end
|
||||
|
||||
--实在不想算了,直接写死吧,毁灭吧
|
||||
|
@ -190,8 +192,8 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
|
|||
local title = Util.GetGameObject(go,"Title"):GetComponent("Text")
|
||||
local teamList = Util.GetGameObject(go,"TeamList")
|
||||
title.text = string.format( "第%s队",NumToChinese[index])
|
||||
self:SetImgPos(go,data.totalForce)
|
||||
|
||||
--self:SetImgPos(go,data.totalForce)
|
||||
Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text").text=data.totalForce
|
||||
for i, demon in ipairs(self.teamList[index].heroList) do
|
||||
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))
|
||||
Util.GetGameObject(demon, "hero"):SetActive(false)
|
||||
|
@ -216,7 +218,7 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
|
|||
if not hero.heroid then
|
||||
return
|
||||
end
|
||||
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
|
||||
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill,msg.treeLevel)
|
||||
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
|
||||
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
|
||||
end)
|
||||
|
|
|
@ -35,6 +35,7 @@ function WorldArenaRankRewardPanel:InitComponent()
|
|||
this.tabbox = Util.GetGameObject(self.gameObject, "tabbox")
|
||||
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
this.Title = Util.GetGameObject(self.gameObject, "Title"):GetComponent("Text")
|
||||
this.Title.text="奖励"
|
||||
this.tipText = Util.GetGameObject(self.gameObject, "content1/tipText"):GetComponent("Text")
|
||||
this.myRank = Util.GetGameObject(self.gameObject, "content1/myRank")
|
||||
this.myRankNum = Util.GetGameObject(self.gameObject, "content1/myRank/num"):GetComponent("Text")
|
||||
|
@ -171,25 +172,19 @@ function this.RefreshMyInfo()
|
|||
end
|
||||
|
||||
--获取奖励
|
||||
if curRankType == 3 then--竞技场
|
||||
for k,value in ConfigPairs(arenaReward) do
|
||||
if myrank <= 3 then
|
||||
if tabNum == 1 then
|
||||
rewardList = arenaReward[myrank].DailyReward
|
||||
elseif tabNum == 2 then
|
||||
rewardList = arenaReward[myrank].SeasonReward
|
||||
end
|
||||
elseif myrank > 3 then
|
||||
--if curRankType == 3 then--竞技场
|
||||
for k,value in ConfigPairs(ConfigList[2]) do
|
||||
-- if myrank > 3 then
|
||||
if myrank >= value.MinRank and myrank <= value.MaxRank then
|
||||
if tabNum == 1 then
|
||||
rewardList = value.DailyReward
|
||||
rewardList = value.SeasonRewardShow
|
||||
elseif tabNum == 2 then
|
||||
rewardList = value.SeasonReward
|
||||
rewardList = value.SeasonRewardShow
|
||||
end
|
||||
end
|
||||
end
|
||||
-- end
|
||||
end
|
||||
end
|
||||
--end
|
||||
|
||||
|
||||
--显示奖励
|
||||
|
@ -224,12 +219,16 @@ function this.ShowRewardInfo()
|
|||
return a.RankId>b.RankId
|
||||
end)
|
||||
this.arenaBottom.gameObject:SetActive(false)
|
||||
this.ScrollView:SetRectTransform(Vector2.New(916,1040))
|
||||
this.ScrollView:SetRectPosition(Vector3.New(0,0,0))
|
||||
elseif tabNum==2 then
|
||||
this.rankTitle.text="排名"
|
||||
for _, configInfo in ConfigPairs(ConfigList[tabNum]) do
|
||||
table.insert(RewardList,configInfo)
|
||||
end
|
||||
this.arenaBottom.gameObject:SetActive(true)
|
||||
this.ScrollView:SetRectTransform(Vector2.New(916,850))
|
||||
this.ScrollView:SetRectPosition(Vector3.New(0,100,0))
|
||||
end
|
||||
|
||||
this.ScrollView:SetData(RewardList, function (index, go)
|
||||
|
|
|
@ -32,12 +32,12 @@ end
|
|||
|
||||
--添加事件监听(用于子类重写)
|
||||
function WorldArenaRecordPopup:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList)
|
||||
-- Game.GlobalEvent:AddEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function WorldArenaRecordPopup:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList)
|
||||
--Game.GlobalEvent:RemoveEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList)
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
|
@ -122,8 +122,6 @@ function this.RankNodeAdapter(node, data,index)
|
|||
local replay = Util.GetGameObject(node, "replay")
|
||||
Util.AddOnceClick(replay, function()
|
||||
|
||||
|
||||
|
||||
NetManager.CrossYuXuLunDaoBattleDetailRecordRequest(PlayerManager.uid,index,function(msg)
|
||||
local windData={}
|
||||
--我的队伍
|
||||
|
@ -156,8 +154,12 @@ function this.RankNodeAdapter(node, data,index)
|
|||
local fightData=fightDataList[i]
|
||||
local heroTeam={}
|
||||
heroTeam.team={}
|
||||
heroTeam.totalForce=msg.recordData.yxldMyForce[i]
|
||||
LogError("myforce=="..msg.recordData.yxldMyForce[i])
|
||||
local enTeam={}
|
||||
enTeam.team={}
|
||||
enTeam.totalForce=msg.recordData.yxldDefForce[i]
|
||||
LogError("en force=="..msg.recordData.yxldDefForce[i])
|
||||
for i = 1, #fightData.heroFightInfos.fightUnitList do
|
||||
local hero=fightData.heroFightInfos.fightUnitList[i]
|
||||
local newHero={}
|
||||
|
@ -199,7 +201,8 @@ function this.RankNodeAdapter(node, data,index)
|
|||
windData.fightData=fightDataList
|
||||
windData.myScore= data.myScoreChange
|
||||
windData.defScore= data.myScoreChange *-1
|
||||
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,data.resultList)
|
||||
|
||||
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,msg.recordData.result)
|
||||
end)
|
||||
|
||||
|
||||
|
|
|
@ -75,8 +75,8 @@ function WorldArenaUpRewardPanel:OnOpen(data)
|
|||
this.rankName.text=rankData.RankName
|
||||
this.scoreTxt.text=lastScore.."/"..rankData.ScoreUp
|
||||
this.progress.fillAmount=(lastScore-minScore)/(maxScore-minScore)
|
||||
currRank=rankData.RankGrade
|
||||
this.SetStarShow(rankData.RankLevel,rankData.RankGrade,self.sortingOrder)
|
||||
--currRank=rankData.RankGrade
|
||||
this.SetStarShow(rankData.RankLevel,rankData.RankGrade+1,self.sortingOrder)
|
||||
this.StartProgressChange(function()
|
||||
local callList2 = Stack.New()
|
||||
local itemRandomDataList={}
|
||||
|
@ -106,8 +106,13 @@ function this.SetStarShow(star,grade,layer)
|
|||
currRank=grade
|
||||
titleLive = poolManager:LoadAsset("fx_duanwei_0"..grade, PoolManager.AssetType.GameObject)
|
||||
titleLive.transform:SetParent(this.rankImg.transform)
|
||||
titleLive.transform.localPosition=Vector3.New(0,-600,0)
|
||||
titleLive.transform.localScale =Vector3.New(1,1,1)
|
||||
if grade==5 then
|
||||
titleLive.transform.localPosition=Vector3.New(0,-500,0)
|
||||
titleLive.transform.localScale =Vector3.New(0.8,0.8,1)
|
||||
else
|
||||
titleLive.transform.localPosition=Vector3.New(0,-600,0)
|
||||
titleLive.transform.localScale =Vector3.New(1,1,1)
|
||||
end
|
||||
AddParticleSortLayer(titleLive,layer)
|
||||
end
|
||||
this.rankName.text=rankData.RankName
|
||||
|
@ -176,6 +181,7 @@ end
|
|||
local num=0
|
||||
--走的条数
|
||||
local walkNum=0
|
||||
local changeNum=1
|
||||
--开始进度条滚动
|
||||
function this.StartProgressChange(func)
|
||||
if this.TimeCounter then
|
||||
|
@ -183,9 +189,15 @@ function this.StartProgressChange(func)
|
|||
end
|
||||
|
||||
local function _TimeUpdate()
|
||||
|
||||
--降低
|
||||
if lastScore<currScore then
|
||||
lastScore=lastScore+1
|
||||
if maxScore-lastScore>15 and currScore-lastScore>15 then
|
||||
changeNum=12
|
||||
else
|
||||
changeNum=1
|
||||
end
|
||||
lastScore=lastScore+changeNum
|
||||
--经验条走到头
|
||||
if lastScore==maxScore+1 then
|
||||
walkNum=walkNum+1
|
||||
|
@ -198,7 +210,12 @@ function this.StartProgressChange(func)
|
|||
end
|
||||
end
|
||||
else
|
||||
lastScore=lastScore-1
|
||||
if lastScore-minScore>15 and lastScore-currScore>15 then
|
||||
changeNum=12
|
||||
else
|
||||
changeNum=1
|
||||
end
|
||||
lastScore=lastScore-changeNum
|
||||
if lastScore==minScore-1 then
|
||||
walkNum=walkNum+1
|
||||
if RankConfig[lastRankId-1] then
|
||||
|
@ -224,14 +241,13 @@ function this.StartProgressChange(func)
|
|||
end
|
||||
|
||||
end
|
||||
this.TimeCounter = Timer.New(_TimeUpdate,0.05, -1, true)
|
||||
this.TimeCounter = Timer.New(_TimeUpdate,0.005, -1, true)
|
||||
this.TimeCounter:Start()
|
||||
end
|
||||
|
||||
|
||||
function this:OnClose()
|
||||
WorldArenaManager.ClearReward()
|
||||
LogError("调用关闭界面方法 "..newResore)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",newResore)
|
||||
if this.TimeCounter then
|
||||
this.TimeCounter:Stop()
|
||||
|
|
|
@ -612,4 +612,9 @@ end
|
|||
function this:SetRectTransform(scrollSizeDeltaV2)
|
||||
self.rectTransform.sizeDelta = scrollSizeDeltaV2
|
||||
end
|
||||
|
||||
function this:SetRectPosition(scrollSizeDeltaV2)
|
||||
self.rectTransform.localPosition = scrollSizeDeltaV2
|
||||
end
|
||||
|
||||
return ScrollCycleView
|
Loading…
Reference in New Issue