玉虚论道提交

dev_chengFeng
wangzhenxing 2021-09-14 10:10:57 +08:00
parent b3eb686222
commit d056a2dd70
22 changed files with 1016 additions and 198 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 5419905ae75aebf458a6cb5e572a63fe
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: aed390a86f6dac94b9e225f8a0dae0e1
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WorldArena
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: e33370dca61c0ec46ba9858cfd7a2cc8
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ca8c497aed048cf4bb960330c8297e05
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WorldArena
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: efa15a6fa087ddd4087e8be91945380a
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: f89cdf00847574f479cf346b400e79f8
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WorldArena
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -10257,6 +10257,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &266211279181201770
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7698794225761946471}
- component: {fileID: 8993465044076395820}
- component: {fileID: 3635881323143732822}
m_Layer: 5
m_Name: Image3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7698794225761946471
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 266211279181201770}
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: 6397020953744984877}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 140, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8993465044076395820
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 266211279181201770}
m_CullTransparentMesh: 0
--- !u!114 &3635881323143732822
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 266211279181201770}
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: e33370dca61c0ec46ba9858cfd7a2cc8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &312225383265032929
GameObject:
m_ObjectHideFlags: 0
@ -16480,6 +16554,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &5072462273132328435
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 979282829102847117}
- component: {fileID: 420955798586934453}
- component: {fileID: 4444035128216747427}
m_Layer: 5
m_Name: Image1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &979282829102847117
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5072462273132328435}
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: 6397020953744984877}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 140, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &420955798586934453
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5072462273132328435}
m_CullTransparentMesh: 0
--- !u!114 &4444035128216747427
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5072462273132328435}
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: efa15a6fa087ddd4087e8be91945380a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5077251336448443383
GameObject:
m_ObjectHideFlags: 0
@ -18112,7 +18260,6 @@ GameObject:
m_Component:
- component: {fileID: 6397020953744984877}
- component: {fileID: 3601278603763931014}
- component: {fileID: 2665363409132689527}
m_Layer: 5
m_Name: yxteamName
m_TagString: Untagged
@ -18131,13 +18278,15 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8877401033210235909}
- {fileID: 979282829102847117}
- {fileID: 8026879925243217641}
- {fileID: 7698794225761946471}
m_Father: {fileID: 491038039515440220}
m_RootOrder: 14
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.000025511, y: 2.2}
m_AnchoredPosition: {x: -0.000025511, y: -24.1}
m_SizeDelta: {x: 145, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3601278603763931014
@ -18148,35 +18297,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6636538027393865705}
m_CullTransparentMesh: 0
--- !u!114 &2665363409132689527
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6636538027393865705}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 50740b9a22150c2449fc4ccfc93e57c9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6662125940454132649
GameObject:
m_ObjectHideFlags: 0
@ -18660,7 +18780,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1993675450983903779
RectTransform:
m_ObjectHideFlags: 0
@ -19770,6 +19890,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7715204809389033438
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8026879925243217641}
- component: {fileID: 7092194249202043059}
- component: {fileID: 3694211616751206443}
m_Layer: 5
m_Name: Image2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8026879925243217641
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7715204809389033438}
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: 6397020953744984877}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 140, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7092194249202043059
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7715204809389033438}
m_CullTransparentMesh: 0
--- !u!114 &3694211616751206443
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7715204809389033438}
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: 5419905ae75aebf458a6cb5e572a63fe, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7798060650847324367
GameObject:
m_ObjectHideFlags: 0
@ -21857,85 +22051,6 @@ RectTransform:
m_AnchoredPosition: {x: 25.649994, y: -0.00001001358}
m_SizeDelta: {x: 41.3, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9028072773077855250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8877401033210235909}
- component: {fileID: 2669066135944711117}
- component: {fileID: 1059720185785027219}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8877401033210235909
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9028072773077855250}
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: 6397020953744984877}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2669066135944711117
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9028072773077855250}
m_CullTransparentMesh: 0
--- !u!114 &1059720185785027219
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9028072773077855250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8588236, g: 0.69803923, b: 0.41960788, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7B2C\u4E00\u961F"
--- !u!1 &9048449166114784265
GameObject:
m_ObjectHideFlags: 0

View File

@ -574,7 +574,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &657138757
RectTransform:
m_ObjectHideFlags: 0
@ -591,7 +591,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: -36, y: -10}
m_AnchoredPosition: {x: 0, y: -10}
m_SizeDelta: {x: 69.37, y: 45.41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &657138759
@ -837,7 +837,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &894724688
RectTransform:
m_ObjectHideFlags: 0
@ -1028,7 +1028,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1099878451
RectTransform:
m_ObjectHideFlags: 0
@ -1467,7 +1467,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: 98, y: -20}
m_AnchoredPosition: {x: 10, y: -10}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1493750795
@ -1815,7 +1815,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: 98, y: -20}
m_AnchoredPosition: {x: 10, y: -10}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2093514786
@ -1956,7 +1956,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8457880590928849603
RectTransform:
m_ObjectHideFlags: 0
@ -16540,7 +16540,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8227696435517290909
RectTransform:
m_ObjectHideFlags: 0
@ -21754,6 +21754,85 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &2224105665504074476
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1555752588146770169}
- component: {fileID: 337529594779010467}
- component: {fileID: 7017288149405621113}
m_Layer: 0
m_Name: Text (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1555752588146770169
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2224105665504074476}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007}
m_Children: []
m_Father: {fileID: 45731545550030046}
m_RootOrder: 14
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: 10, y: -280}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &337529594779010467
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2224105665504074476}
m_CullTransparentMesh: 0
--- !u!114 &7017288149405621113
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2224105665504074476}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9333334, g: 0.64705884, b: 0.2901961, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7B2C\u4E09\u961F"
--- !u!1 &2240353759922199469
GameObject:
m_ObjectHideFlags: 0
@ -44541,7 +44620,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4951783905278625201
RectTransform:
m_ObjectHideFlags: 0
@ -45112,7 +45191,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1278960907590219744
RectTransform:
m_ObjectHideFlags: 0
@ -45270,7 +45349,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4936434519639577691
RectTransform:
m_ObjectHideFlags: 0
@ -51179,6 +51258,85 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4040349943397729528
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5078161218142474052}
- component: {fileID: 6237899674729917594}
- component: {fileID: 6646709122892044375}
m_Layer: 0
m_Name: Text (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5078161218142474052
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4040349943397729528}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007}
m_Children: []
m_Father: {fileID: 45731545550030046}
m_RootOrder: 13
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: 10, y: 20}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6237899674729917594
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4040349943397729528}
m_CullTransparentMesh: 0
--- !u!114 &6646709122892044375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4040349943397729528}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9333334, g: 0.64705884, b: 0.2901961, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7B2C\u4E8C\u961F"
--- !u!1 &4067876820408689322
GameObject:
m_ObjectHideFlags: 0
@ -59714,6 +59872,85 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5482476659725928573
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 401543628526806861}
- component: {fileID: 2091435846031650927}
- component: {fileID: 2319867812989225784}
m_Layer: 0
m_Name: Text (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &401543628526806861
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5482476659725928573}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007}
m_Children: []
m_Father: {fileID: 45731545550030046}
m_RootOrder: 12
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: 10, y: 329.94287}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2091435846031650927
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5482476659725928573}
m_CullTransparentMesh: 0
--- !u!114 &2319867812989225784
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5482476659725928573}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9333334, g: 0.64705884, b: 0.2901961, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7B2C\u4E00\u961F"
--- !u!1 &5514340458282624389
GameObject:
m_ObjectHideFlags: 0
@ -71576,6 +71813,9 @@ RectTransform:
- {fileID: 5695945550081508759}
- {fileID: 4703390379678214157}
- {fileID: 3150793858915769818}
- {fileID: 401543628526806861}
- {fileID: 5078161218142474052}
- {fileID: 1555752588146770169}
m_Father: {fileID: 8287557198943698003}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -2598,7 +2598,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.0009918199, y: -0.000013113}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 304.56, y: 156.09}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2964586830248146171
@ -2642,7 +2642,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 999-999
m_Text: 600-1000
--- !u!1 &6350098960170293220
GameObject:
m_ObjectHideFlags: 0
@ -3089,8 +3089,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: 3, y: -1.3000116}
m_SizeDelta: {x: 250.56, y: 156.09}
m_AnchoredPosition: {x: 12.31, y: 0}
m_SizeDelta: {x: 340.81, y: 156.09}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1575186693010856201
CanvasRenderer:

View File

@ -136,6 +136,11 @@ CROSSYUXULUNDAOBATTLERECORDREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOBATTLERECORDRESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD = protobuf.FieldDescriptor();
GETARENAINFORESPONSE_ARENAINFO_FIELD.name = "arenaInfo"
GETARENAINFORESPONSE_ARENAINFO_FIELD.full_name = ".rpc.protocols.GetArenaInfoResponse.arenaInfo"
@ -1377,6 +1382,51 @@ CROSSYUXULUNDAOBATTLERECORDRESPONSE.enum_types = {}
CROSSYUXULUNDAOBATTLERECORDRESPONSE.fields = {CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD}
CROSSYUXULUNDAOBATTLERECORDRESPONSE.is_extendable = false
CROSSYUXULUNDAOBATTLERECORDRESPONSE.extensions = {}
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.name = "uid"
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleDetailRecordRequest.uid"
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.number = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.index = 0
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.label = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.has_default_value = false
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.default_value = 0
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.type = 5
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD.cpp_type = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.name = "num"
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleDetailRecordRequest.num"
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.number = 2
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.index = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.label = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.has_default_value = false
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.default_value = 0
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.type = 5
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD.cpp_type = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST.name = "CrossYuXuLunDaoBattleDetailRecordRequest"
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleDetailRecordRequest"
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST.nested_types = {}
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST.enum_types = {}
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST.fields = {CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_UID_FIELD, CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST_NUM_FIELD}
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST.is_extendable = false
CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST.extensions = {}
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.name = "recordData"
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleDetailRecordResponse.recordData"
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.number = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.index = 0
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.label = 1
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.has_default_value = false
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.default_value = nil
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.message_type = CommonProto_pb.CROSSYXLDPLAYERRECORDINFO
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.type = 11
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD.cpp_type = 10
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE.name = "CrossYuXuLunDaoBattleDetailRecordResponse"
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleDetailRecordResponse"
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE.nested_types = {}
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE.enum_types = {}
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE.fields = {CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE_RECORDDATA_FIELD}
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE.is_extendable = false
CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE.extensions = {}
ArenaChallengeRequest = protobuf.Message(ARENACHALLENGEREQUEST)
ArenaChallengeResponse = protobuf.Message(ARENACHALLENGERESPONSE)
@ -1396,6 +1446,8 @@ ChampionTwoEnemInfo = protobuf.Message(CHAMPIONTWOENEMINFO)
ChampionViewFinalRequest = protobuf.Message(CHAMPIONVIEWFINALREQUEST)
ChampionViewFinalResponse = protobuf.Message(CHAMPIONVIEWFINALRESPONSE)
ChanpionGetAllMyBattleHistoryResponse = protobuf.Message(CHANPIONGETALLMYBATTLEHISTORYRESPONSE)
CrossYuXuLunDaoBattleDetailRecordRequest = protobuf.Message(CROSSYUXULUNDAOBATTLEDETAILRECORDREQUEST)
CrossYuXuLunDaoBattleDetailRecordResponse = protobuf.Message(CROSSYUXULUNDAOBATTLEDETAILRECORDRESPONSE)
CrossYuXuLunDaoBattleRecordRequest = protobuf.Message(CROSSYUXULUNDAOBATTLERECORDREQUEST)
CrossYuXuLunDaoBattleRecordResponse = protobuf.Message(CROSSYUXULUNDAOBATTLERECORDRESPONSE)
CrossYuXuLunDaoChallengeBeforeRequest = protobuf.Message(CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST)

View File

@ -734,6 +734,7 @@ CROSSYXLDPLAYERRECORDINFO_RESULTLIST_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD = protobuf.FieldDescriptor();
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
@ -7700,9 +7701,9 @@ CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.number = 16
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.index = 15
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.label = 1
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.has_default_value = false
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.default_value = 0
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.type = 5
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.cpp_type = 1
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.default_value = ""
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.type = 9
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD.cpp_type = 9
CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD.name = "result"
CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.result"
@ -7714,11 +7715,21 @@ CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD.default_value = {}
CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD.type = 5
CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD.cpp_type = 1
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.name = "myServerName"
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.myServerName"
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.number = 18
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.index = 17
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.label = 1
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.has_default_value = false
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.default_value = ""
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.type = 9
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.cpp_type = 9
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.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.is_extendable = false
CROSSYXLDPLAYERRECORDINFO.extensions = {}

File diff suppressed because one or more lines are too long

View File

@ -320,7 +320,6 @@ GETPLAYERONETEAMINFOREQUEST = protobuf.Descriptor();
GETPLAYERONETEAMINFOREQUEST_PLAYERID_FIELD = protobuf.FieldDescriptor();
GETPLAYERONETEAMINFOREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
GETPLAYERONETEAMINFOREQUEST_SERVERID_FIELD = protobuf.FieldDescriptor();
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD = protobuf.FieldDescriptor();
GETPLAYERONETEAMINFORESPONSE = protobuf.Descriptor();
GETPLAYERONETEAMINFORESPONSE_TEAMINFO_FIELD = protobuf.FieldDescriptor();
TAKESENVENSCOREREWARDRESPONSE = protobuf.Descriptor();
@ -3520,21 +3519,11 @@ GETPLAYERONETEAMINFOREQUEST_SERVERID_FIELD.default_value = 0
GETPLAYERONETEAMINFOREQUEST_SERVERID_FIELD.type = 5
GETPLAYERONETEAMINFOREQUEST_SERVERID_FIELD.cpp_type = 1
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.name = "teamType"
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.full_name = ".rpc.protocols.GetPlayerOneTeamInfoRequest.teamType"
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.number = 4
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.index = 3
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.label = 1
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.has_default_value = false
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.default_value = 0
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.type = 5
GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD.cpp_type = 1
GETPLAYERONETEAMINFOREQUEST.name = "GetPlayerOneTeamInfoRequest"
GETPLAYERONETEAMINFOREQUEST.full_name = ".rpc.protocols.GetPlayerOneTeamInfoRequest"
GETPLAYERONETEAMINFOREQUEST.nested_types = {}
GETPLAYERONETEAMINFOREQUEST.enum_types = {}
GETPLAYERONETEAMINFOREQUEST.fields = {GETPLAYERONETEAMINFOREQUEST_PLAYERID_FIELD, GETPLAYERONETEAMINFOREQUEST_TEAMID_FIELD, GETPLAYERONETEAMINFOREQUEST_SERVERID_FIELD, GETPLAYERONETEAMINFOREQUEST_TEAMTYPE_FIELD}
GETPLAYERONETEAMINFOREQUEST.fields = {GETPLAYERONETEAMINFOREQUEST_PLAYERID_FIELD, GETPLAYERONETEAMINFOREQUEST_TEAMID_FIELD, GETPLAYERONETEAMINFOREQUEST_SERVERID_FIELD}
GETPLAYERONETEAMINFOREQUEST.is_extendable = false
GETPLAYERONETEAMINFOREQUEST.extensions = {}
GETPLAYERONETEAMINFORESPONSE_TEAMINFO_FIELD.name = "teamInfo"

View File

@ -685,8 +685,12 @@ function this.SingleHeroDataShow(_go, _heroData)
local lv= Util.GetGameObject(go, "lv/Text"):GetComponent("Text")
local pro= Util.GetGameObject(go, "proIcon"):GetComponent("Image")
local pos= Util.GetGameObject(go, "posIcon"):GetComponent("Image")
local teamList={}
for i = 1, 3 do
table.insert(teamList,Util.GetGameObject(go, "yxteamName/Image"..i))
end
local yxInfo=Util.GetGameObject(go, "yxteamName")
local yxTeamName=Util.GetGameObject(go, "yxteamName/Text"):GetComponent("Text")
--local yxTeamName=Util.GetGameObject(go, "yxteamName/Text"):GetComponent("Text")
yxInfo:SetActive(false)
Util.GetGameObject(go, "posIcon"):SetActive(this.curFormationIndex == FormationTypeDef.FIGHT_LEVEL or this.curFormationIndex == FormationTypeDef.FIGHT_ASSISTANTLEVEL)
local starGrid = Util.GetGameObject(go, "star")
@ -748,13 +752,10 @@ function this.SingleHeroDataShow(_go, _heroData)
local index = this.opView.GetHeroTeam(heroData.dynamicId)
if index and index ~= this.curFormationIndex then
yxInfo:SetActive(true)
if index==2001 then
yxTeamName.text="第一队"
elseif index==2002 then
yxTeamName.text="第二队"
elseif index==2003 then
yxTeamName.text="第三队"
for i = 1, 3 do
teamList[i]:SetActive(false)
end
teamList[index-2000]:SetActive(true)
end
end
end

View File

@ -42,6 +42,7 @@ local switchFunc = function (type)
this.ChangeTeamIndex(type)
end
local isLeftOrRight=false
--- 逻辑初始化
function this.Init(root,...)
@ -60,11 +61,34 @@ function this.Init(root,...)
--左右切换按钮
this.btnLeft = Util.GetGameObject(this.root.switchBar,"btnLeft")
this.btnRight = Util.GetGameObject(this.root.switchBar,"btnRight")
this._RefreshTimeStemp=0
Util.AddOnceClick(this.btnLeft,function ()
local curTimeStemp = GetTimeStamp()
local limitTime = 1
-- 计算距离下一次刷新剩余时间
local lastTime = math.floor(limitTime - (curTimeStemp - this._RefreshTimeStemp))
if this._RefreshTimeStemp ~= 0 and lastTime > 0 then
--PopupTipPanel.ShowTip(lastTime..Language[10079])
return
end
this._RefreshTimeStemp = curTimeStemp
this.curIndex = (this.curIndex + 2) % 3 == 0 and 3 or (this.curIndex + 2) % 3
isLeftOrRight=true
checkFunc()
end)
Util.AddOnceClick(this.btnRight,function ()
local curTimeStemp = GetTimeStamp()
local limitTime = 1
-- 计算距离下一次刷新剩余时间
local lastTime = math.floor(limitTime - (curTimeStemp - this._RefreshTimeStemp))
if this._RefreshTimeStemp ~= 0 and lastTime > 0 then
-- PopupTipPanel.ShowTip(lastTime..Language[10079])
return
end
this._RefreshTimeStemp = curTimeStemp
isLeftOrRight=true
this.curIndex = (this.curIndex + 1) % 3 == 0 and 3 or (this.curIndex + 1) % 3
checkFunc()
end)
@ -73,10 +97,29 @@ function this.Init(root,...)
this.btnSwitch1 = Util.GetGameObject(this.root.switchBar,"GameObject/btnSwitch (1)")
this.btnSwitch2 = Util.GetGameObject(this.root.switchBar,"GameObject/btnSwitch (2)")
Util.AddOnceClick(this.btnSwitch1,function ()
local curTimeStemp = GetTimeStamp()
local limitTime = 1
-- 计算距离下一次刷新剩余时间
local lastTime = math.floor(limitTime - (curTimeStemp - this._RefreshTimeStemp))
if this._RefreshTimeStemp ~= 0 and lastTime > 0 then
--PopupTipPanel.ShowTip(lastTime..Language[10079])
return
end
this._RefreshTimeStemp = curTimeStemp
switchFunc(1)
checkFunc()
end)
Util.AddOnceClick(this.btnSwitch2,function ()
local curTimeStemp = GetTimeStamp()
local limitTime = 1
-- 计算距离下一次刷新剩余时间
local lastTime = math.floor(limitTime - (curTimeStemp - this._RefreshTimeStemp))
if this._RefreshTimeStemp ~= 0 and lastTime > 0 then
-- PopupTipPanel.ShowTip(lastTime..Language[10079])
return
end
this._RefreshTimeStemp = curTimeStemp
switchFunc(2)
checkFunc()
end)
@ -89,6 +132,15 @@ function this.Init(root,...)
this.lightList[i] = Util.GetGameObject(this.numList[i],"Image")
this.lightList[i]:SetActive(false)
Util.AddOnceClick(this.numList[i],function ()
local curTimeStemp = GetTimeStamp()
local limitTime = 1
-- 计算距离下一次刷新剩余时间
local lastTime = math.floor(limitTime - (curTimeStemp - this._RefreshTimeStemp))
if this._RefreshTimeStemp ~= 0 and lastTime > 0 then
--PopupTipPanel.ShowTip(lastTime..Language[10079])
return
end
this._RefreshTimeStemp = curTimeStemp
this.curIndex = i
checkFunc()
end)
@ -114,6 +166,11 @@ function this.GetFormationIndex()
return 2000 + this.curIndex
end
function this.GetIsLeftOrRight()
return isLeftOrRight
end
--移除缓存数据
function this.RemoveTeamByIndex(_index)
local value = currAllTeams[_index]

View File

@ -5615,4 +5615,22 @@ function this.CrossYuXuLunDaoBattleRecordRequest(id,func)
end)
end
--玉虚论道请求回放详情记录
function this.CrossYuXuLunDaoBattleDetailRecordRequest(id,num, func)
local data = ArenaInfoProto_pb.CrossYuXuLunDaoBattleDetailRecordRequest()
data.uid=id
data.num=num
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoBattleDetailRecordRequest, MessageTypeProto_pb.CrossYuXuLunDaoBattleDetailRecordResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoBattleDetailRecordResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
return this

View File

@ -107,7 +107,10 @@ local function OnEndDrag(self, Pointgo, data)
FormationManager.SaveFormation(i+2000, heros,
FormationManager.formationList[2001].teamPokemonInfos)
end
local teampos={}
teampos=leftAllTeam[currIndex]
leftAllTeam[currIndex]=leftAllTeam[targetIndex]
leftAllTeam[targetIndex]=teampos
end
end
--初始化组件(用于子类重写)
@ -458,8 +461,8 @@ function this.ShowInfo(msg)
end
function this.ShowBattleState(index,state)
--for i = 1, 3 do
Util.GetGameObject(this.leftTeam[index], "Text").gameObject:SetActive(state~=3)
Util.GetGameObject(this.rightTeam[index], "Text").gameObject:SetActive(state~=3)
-- Util.GetGameObject(this.leftTeam[index], "Text").gameObject:SetActive(state~=3)
-- Util.GetGameObject(this.rightTeam[index], "Text").gameObject:SetActive(state~=3)
local leftImg=Util.GetGameObject(this.leftTeam[index], "Image"):GetComponent("Image")
local rightImg=Util.GetGameObject(this.rightTeam[index], "Image"):GetComponent("Image")
leftImg.gameObject:SetActive(state==3)
@ -509,9 +512,6 @@ function this.SetTeamInfo(_go,teamData,type)
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
Util.GetGameObject(teamList[hero.position], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
if type==1 then
LogError("hero star=="..hero.star)
end
SetHeroIcon(this.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
local frameBtn = Util.GetGameObject(teamList[hero.position], "frame")
--local heroData = {}

View File

@ -94,7 +94,6 @@ function WorldArenaMainPanel:BindEvent()
return
end
end
LogError("/////////////////")
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,enemyList[i],function(msg)
LogError("open battleinfo ???")
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function()
@ -243,7 +242,6 @@ function this.SetStarShow(grade,layer)
function this.ShowRewardBoxProgressData()
-- local baseData = ArenaManager.GetArenaBaseData()
local allNums = WorldArenaManager.GetchallengeTimes()
LogError("allnum============"..allNums)
--宝箱领取状态
local allBoxGetState = rewardState
local maxNum = 0
@ -254,14 +252,11 @@ function this.ShowRewardBoxProgressData()
maxNum=rewards[i][1]
end
end
for i = 1, #allBoxGetState do
LogError("state=="..allBoxGetState[i])
end
for i = 1, #rewardBoxBtn do
if rewards[i] then
local state = 1--1 未完成 2 未领取 3 已完成allNums >= arenaBattleReward[i].BattleTimes and false
LogError("allnum=="..allNums.." rewards[i][1]== "..rewards[i][1].." boxstate=="..allBoxGetState[i])
--LogError("allnum=="..allNums.." rewards[i][1]== "..rewards[i][1].." boxstate=="..allBoxGetState[i])
if allNums < rewards[i][1] then
state = 1
elseif allNums >= rewards[i][1] and allBoxGetState[i]~=2 then
@ -269,7 +264,6 @@ function this.ShowRewardBoxProgressData()
else
state = 3
end
LogError("state=="..state)
Util.GetGameObject(rewardBoxBtn[i], "redPoint"):SetActive(state == 2)
Util.GetGameObject(rewardBoxBtn[i], "Text"):GetComponent("Text").text = rewards[i][1]..Language[10048]
Util.GetGameObject(rewardBoxBtn[i], "getFinish"):SetActive(state == 3)

View File

@ -157,6 +157,7 @@ function WorldArenaOtherTeamPanel:SetImgPos(_go,data)
end
end
local serverName=nil
--玩家信息
function WorldArenaOtherTeamPanel:SetPlayerInfo(go,playerData)
local head = Util.GetGameObject(go, "head")
@ -174,7 +175,7 @@ function WorldArenaOtherTeamPanel:SetPlayerInfo(go,playerData)
self.PlayerHead:SetLevel(playerData.level)
self.PlayerHead:SetLayer(self.sortingOrder)
self.PlayerHead:SetEffectScale(0.9)
serverName=playerData.serverName
name.text = PracticeManager.SetNameColor(playerData.serverName.." "..playerData.name,playerData.practiceLevel)
score.text = string.format( "积分:%s",playerData.crossTeamScore)
local rank=WorldArenaManager.GetRankImgByScore(playerData.crossTeamScore)
@ -210,12 +211,13 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
local frameBtn = Util.GetGameObject(self.teamList[index].heroList[hero.position], "frame")
local heroData = {}
Util.AddOnceClick(frameBtn, function()
NetManager.ViewHeroInfoRequest(self.playerId,hero.heroid,1,PLAYER_INFO_VIEW_TYPE.NORMAL,function(msg)
LogError("playerid=="..self.playerId.." heroid=="..hero.heroid.." servername=="..serverName.." arrayid=="..2000+index)
NetManager.ViewHeroInfoRequest(self.playerId,hero.heroid,serverName,2000+index,function(msg)
if not hero.heroid then
return
return
end
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
GoodFriendManager.InitEquipData(msg.equip,heroData)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
end)
end)

View File

@ -284,11 +284,11 @@ function this.ActivityRewardSingleShow(activityRewardGo,rewardData,index)
end
else
sortNumTabs[4]:SetActive(true)
if rewardData.MaxRank > 100 then
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text =rewardData.MinRank-1 .."+"
else
--if rewardData.MaxRank > 100 then
-- Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text =rewardData.MinRank-1 .."+"
-- else
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text =rewardData.MinRank .."-".. rewardData.MaxRank
end
--end
end
end

View File

@ -58,12 +58,12 @@ function this.RefreshRecordList(_data)
end
-- 重置排行列表
this.ScrollView:SetData(recordList, function (index, go)
this.RankNodeAdapter(go, recordList[index])
this.RankNodeAdapter(go, recordList[index],index)
end)
end
-- 排名节点数据匹配
function this.RankNodeAdapter(node, data)
function this.RankNodeAdapter(node, data,index)
--- 基础信息
local head = Util.GetGameObject(node, "head")
local lv_name = Util.GetGameObject(node, "lv_name"):GetComponent("Text")
@ -121,6 +121,10 @@ function this.RankNodeAdapter(node, data)
-- 给回放按钮添加事件
local replay = Util.GetGameObject(node, "replay")
Util.AddOnceClick(replay, function()
NetManager.CrossYuXuLunDaoBattleDetailRecordRequest(PlayerManager.uid,index,function(msg)
local windData={}
--我的队伍
local myTeamInfo={}
@ -130,7 +134,7 @@ function this.RankNodeAdapter(node, data)
myTeamInfo.head=PlayerManager.head
myTeamInfo.headFrame=HeadManager.GetCurFrameId()
myTeamInfo.practiceLevel= PracticeManager.PracticeLevel
myTeamInfo.serverName=PlayerManager.serverInfo.name
myTeamInfo.serverName=data.myServerName
myTeamInfo.crossTeamScore=WorldArenaManager.GetNewScore()
myTeamInfo.myScore= data.myScoreChange
--敌方队伍
@ -144,7 +148,7 @@ function this.RankNodeAdapter(node, data)
enTeamInfo.name=data.userName
enTeamInfo.crossTeamScore=data.score
enTeamInfo.myScore= data.myScoreChange*-1
local fightDataList={data.fightData1,data.fightData2,data.fightData3}
local fightDataList={msg.recordData.fightData1,msg.recordData.fightData2,msg.recordData.fightData3}
--获取双方队伍数据
local allHeroTeam={}
local allEnTeam={}
@ -186,17 +190,6 @@ function this.RankNodeAdapter(node, data)
if type==1 or type==2 then
myTeamInfo.crossTeam=allHeroTeam
enTeamInfo.crossTeam=allEnTeam
-- myTeamInfo.crossTeam={}
-- myTeamInfo.crossTeam.team=allHeroTeam
-- enTeamInfo.crossTeam={}
-- enTeamInfo.crossTeam.team=allEnTeam
-- myTeamInfo.crossTeam={}
-- enTeamInfo.crossTean={}
-- for i = 1, 3 do
-- myTeamInfo.crossTeam[i].team=allHeroTeam[i]
-- enTeamInfo.crossTeam[i].team=allEnTeam[i]
-- end
else
myTeamInfo.crossTeam=allEnTeam
enTeamInfo.crossTeam=allHeroTeam
@ -209,6 +202,9 @@ function this.RankNodeAdapter(node, data)
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,data.resultList)
end)
end)
end
--界面关闭时调用(用于子类重写)

View File

@ -85,9 +85,12 @@ function WorldArenaUpRewardPanel:OnOpen(data)
aaa.itemlist= WorldArenaManager.GetReward()
LogError("itemlist len=="..#WorldArenaManager.GetReward())
LogError("aaa.itemlist len=="..#aaa.itemlist)
itemRandomDataList=BagManager.GetTableByBackDropData(aaa)
local baseContentList2={}
this.SetItemShow(aaa,itemRandomDataList,this.grid.transform,callList2,baseContentList2)
if aaa.itemlist and #aaa.itemlist>0 then
itemRandomDataList=BagManager.GetTableByBackDropData(aaa)
local baseContentList2={}
this.SetItemShow(aaa,itemRandomDataList,this.grid.transform,callList2,baseContentList2)
end
end)
end
@ -184,7 +187,7 @@ function this.StartProgressChange(func)
if lastScore<currScore then
lastScore=lastScore+1
--经验条走到头
if lastScore==maxScore then
if lastScore==maxScore+1 then
walkNum=walkNum+1
if RankConfig[lastRankId+1] then
lastRankId=lastRankId+1
@ -196,7 +199,7 @@ function this.StartProgressChange(func)
end
else
lastScore=lastScore-1
if lastScore==minScore then
if lastScore==minScore-1 then
walkNum=walkNum+1
if RankConfig[lastRankId-1] then
lastRankId=lastRankId-1