Merge branch 'china/dev' into china/ios
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua # Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua # Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua # Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua # Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.luadev_chengFeng
commit
3819869e27
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dd5c04a446b4673499e751f7c5db8292
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/atlas/dyact_activity7
|
||||
assetBundleVariant: unity3d
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 223 KiB |
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4aae9cc118ac78648b896562bc7c8913
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 60d701b6684397846aa7d206b335b0f6
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DyAct_Activity8
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 208 KiB |
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5c8ecb81c56ca0f4bbbb85e865cc93b7
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: d5dcabd5ed083a74ba55470a1c110e30
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DyAct_Activity8
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -43549,7 +43549,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 369711104}
|
||||
- component: {fileID: 369711108}
|
||||
- component: {fileID: 369711107}
|
||||
- component: {fileID: 369711106}
|
||||
- component: {fileID: 369711105}
|
||||
m_Layer: 5
|
||||
|
|
@ -43600,23 +43599,6 @@ Canvas:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &369711107
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 369711103}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!222 &369711106
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -44063,7 +44045,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 601964300}
|
||||
- component: {fileID: 601964304}
|
||||
- component: {fileID: 601964303}
|
||||
- component: {fileID: 601964302}
|
||||
- component: {fileID: 601964301}
|
||||
m_Layer: 5
|
||||
|
|
@ -44114,23 +44095,6 @@ Canvas:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &601964303
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 601964299}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!222 &601964302
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -220923,12 +220887,7 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -220953,7 +220912,12 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221088,12 +221052,7 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221118,7 +221077,12 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221398,12 +221362,7 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221428,7 +221387,12 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221563,12 +221527,7 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221593,7 +221552,12 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221728,12 +221692,7 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221758,7 +221717,12 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221893,12 +221857,7 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -221923,7 +221882,12 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
|
|||
|
|
@ -173,7 +173,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: 1.3, y: 55.49997}
|
||||
m_AnchoredPosition: {x: 0, y: 55.49997}
|
||||
m_SizeDelta: {x: 920, y: 8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4146893012571655265
|
||||
|
|
@ -247,7 +247,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: 371.9, y: 1.2001038}
|
||||
m_AnchoredPosition: {x: 300, y: 1.2001038}
|
||||
m_SizeDelta: {x: 168, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8042439069031667320
|
||||
|
|
@ -6885,7 +6885,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: -3, y: -297}
|
||||
m_AnchoredPosition: {x: 0, y: -297}
|
||||
m_SizeDelta: {x: 821.5, y: 52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4757695694222023466
|
||||
|
|
@ -12893,7 +12893,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: 376.6, y: 1.2001038}
|
||||
m_AnchoredPosition: {x: 300, y: 1.2001038}
|
||||
m_SizeDelta: {x: 168, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7719582181164328458
|
||||
|
|
@ -12967,7 +12967,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.6, y: 55.49997}
|
||||
m_AnchoredPosition: {x: 0, y: 55.49997}
|
||||
m_SizeDelta: {x: 920, y: 8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7176301689861227510
|
||||
|
|
@ -13084,7 +13084,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: 3.5, y: -312}
|
||||
m_AnchoredPosition: {x: 0, y: -312}
|
||||
m_SizeDelta: {x: 608.6, y: 52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4475819037436970315
|
||||
|
|
@ -14178,7 +14178,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.6, y: 40}
|
||||
m_AnchoredPosition: {x: 0, y: 40}
|
||||
m_SizeDelta: {x: 920, y: 8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5925393246020135104
|
||||
|
|
@ -25267,7 +25267,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: 377.1, y: 1.2001038}
|
||||
m_AnchoredPosition: {x: 300, y: 1.2001038}
|
||||
m_SizeDelta: {x: 168, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2879338420787377633
|
||||
|
|
@ -25500,7 +25500,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: -375.3, y: 1.2001038}
|
||||
m_AnchoredPosition: {x: -300, y: 1.2001038}
|
||||
m_SizeDelta: {x: 168, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5077245990613367403
|
||||
|
|
@ -26488,7 +26488,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: -375.7, y: 1.2001038}
|
||||
m_AnchoredPosition: {x: -300, y: 1.2001038}
|
||||
m_SizeDelta: {x: 168, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1021194518210858520
|
||||
|
|
@ -31649,7 +31649,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: -371, y: 1.2001038}
|
||||
m_AnchoredPosition: {x: -300, y: 1.2001038}
|
||||
m_SizeDelta: {x: 168, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4233380083872590995
|
||||
|
|
@ -42583,7 +42583,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: -25.625, y: -300.7}
|
||||
m_AnchoredPosition: {x: 0, y: -300.7}
|
||||
m_SizeDelta: {x: 776.25, y: 52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6671624442038027724
|
||||
|
|
@ -48484,15 +48484,15 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
|
@ -48504,17 +48504,17 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -48649,15 +48649,15 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
|
@ -48669,17 +48669,17 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -48814,15 +48814,15 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
|
@ -48834,17 +48834,17 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -48979,15 +48979,15 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
|
@ -48999,17 +48999,17 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -49144,15 +49144,15 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
|
@ -49164,17 +49164,17 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
@ -49309,15 +49309,15 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
|
@ -49329,17 +49329,17 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5B9D\u7BB1\u5728\u519B\u56E2\u6218\u7ED3\u675F\u540E\u4EA7\u751F\uFF0C\u6BCF\u4E2A\u6210\u5458\u53EF\u5F00\u542F1\u6B21\uFF0C\u8BD5\u8BD5\u624B\u6C14\u5427\uFF01"
|
||||
m_Text: "\u5B9D\u7BB1\u5728\u5341\u7EDD\u9635\u7ED3\u675F\u540E\u4EA7\u751F\uFF0C\u6BCF\u4E2A\u6210\u5458\u53EF\u5F00\u542F1\u6B21\uFF0C\u8BD5\u8BD5\u624B\u6C14\u5427\uFF01"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1545234295191858481
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ TRIALHEROINFO_STAR_FIELD = protobuf.FieldDescriptor();
|
|||
TRIALHEROINFO_HEROHP_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor();
|
||||
DIFFICULTMAPOPTION = protobuf.Descriptor();
|
||||
DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor();
|
||||
DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -152,8 +153,11 @@ ENDLESSSETTEAMINDICATION_INFO_FIELD = protobuf.FieldDescriptor();
|
|||
ENDLESSMAPCHANGE = protobuf.Descriptor();
|
||||
ENDLESSMAPCHANGE_MAPID_FIELD = protobuf.FieldDescriptor();
|
||||
ENDLESSMAPCHANGE_WORLDLEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALSAVEHERO = protobuf.Descriptor();
|
||||
TRIALSAVEHERO_HEROID_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALSAVEHERO_POSITION_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFOSAVEREQUEST = protobuf.Descriptor();
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFOSAVERESPONSE = protobuf.Descriptor();
|
||||
TRIALHEROINFOSAVERESPONSE_HEROES_FIELD = protobuf.FieldDescriptor();
|
||||
GETTRIALBOXREWARDREQUEST = protobuf.Descriptor();
|
||||
|
|
@ -325,11 +329,21 @@ TRIALHEROINFO_SKINID_FIELD.default_value = 0
|
|||
TRIALHEROINFO_SKINID_FIELD.type = 5
|
||||
TRIALHEROINFO_SKINID_FIELD.cpp_type = 1
|
||||
|
||||
TRIALHEROINFO_POSITION_FIELD.name = "position"
|
||||
TRIALHEROINFO_POSITION_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.position"
|
||||
TRIALHEROINFO_POSITION_FIELD.number = 7
|
||||
TRIALHEROINFO_POSITION_FIELD.index = 6
|
||||
TRIALHEROINFO_POSITION_FIELD.label = 1
|
||||
TRIALHEROINFO_POSITION_FIELD.has_default_value = false
|
||||
TRIALHEROINFO_POSITION_FIELD.default_value = 0
|
||||
TRIALHEROINFO_POSITION_FIELD.type = 5
|
||||
TRIALHEROINFO_POSITION_FIELD.cpp_type = 1
|
||||
|
||||
TRIALHEROINFO.name = "TrialHeroInfo"
|
||||
TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo"
|
||||
TRIALHEROINFO.nested_types = {}
|
||||
TRIALHEROINFO.enum_types = {}
|
||||
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD}
|
||||
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD}
|
||||
TRIALHEROINFO.is_extendable = false
|
||||
TRIALHEROINFO.extensions = {}
|
||||
DIFFICULTMAPOPTION_ID_FIELD.name = "Id"
|
||||
|
|
@ -1619,21 +1633,49 @@ ENDLESSMAPCHANGE.enum_types = {}
|
|||
ENDLESSMAPCHANGE.fields = {ENDLESSMAPCHANGE_MAPID_FIELD, ENDLESSMAPCHANGE_WORLDLEVEL_FIELD}
|
||||
ENDLESSMAPCHANGE.is_extendable = false
|
||||
ENDLESSMAPCHANGE.extensions = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.name = "heroIds"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest.heroIds"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.number = 1
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.index = 0
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.label = 3
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.has_default_value = false
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.default_value = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.type = 9
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.cpp_type = 9
|
||||
TRIALSAVEHERO_HEROID_FIELD.name = "heroId"
|
||||
TRIALSAVEHERO_HEROID_FIELD.full_name = ".rpc.protocols.TrialSaveHero.heroId"
|
||||
TRIALSAVEHERO_HEROID_FIELD.number = 1
|
||||
TRIALSAVEHERO_HEROID_FIELD.index = 0
|
||||
TRIALSAVEHERO_HEROID_FIELD.label = 1
|
||||
TRIALSAVEHERO_HEROID_FIELD.has_default_value = false
|
||||
TRIALSAVEHERO_HEROID_FIELD.default_value = ""
|
||||
TRIALSAVEHERO_HEROID_FIELD.type = 9
|
||||
TRIALSAVEHERO_HEROID_FIELD.cpp_type = 9
|
||||
|
||||
TRIALSAVEHERO_POSITION_FIELD.name = "position"
|
||||
TRIALSAVEHERO_POSITION_FIELD.full_name = ".rpc.protocols.TrialSaveHero.position"
|
||||
TRIALSAVEHERO_POSITION_FIELD.number = 2
|
||||
TRIALSAVEHERO_POSITION_FIELD.index = 1
|
||||
TRIALSAVEHERO_POSITION_FIELD.label = 1
|
||||
TRIALSAVEHERO_POSITION_FIELD.has_default_value = false
|
||||
TRIALSAVEHERO_POSITION_FIELD.default_value = 0
|
||||
TRIALSAVEHERO_POSITION_FIELD.type = 5
|
||||
TRIALSAVEHERO_POSITION_FIELD.cpp_type = 1
|
||||
|
||||
TRIALSAVEHERO.name = "TrialSaveHero"
|
||||
TRIALSAVEHERO.full_name = ".rpc.protocols.TrialSaveHero"
|
||||
TRIALSAVEHERO.nested_types = {}
|
||||
TRIALSAVEHERO.enum_types = {}
|
||||
TRIALSAVEHERO.fields = {TRIALSAVEHERO_HEROID_FIELD, TRIALSAVEHERO_POSITION_FIELD}
|
||||
TRIALSAVEHERO.is_extendable = false
|
||||
TRIALSAVEHERO.extensions = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.name = "heroes"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest.heroes"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.number = 1
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.index = 0
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.label = 3
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.has_default_value = false
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.default_value = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.message_type = TRIALSAVEHERO
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.type = 11
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.cpp_type = 10
|
||||
|
||||
TRIALHEROINFOSAVEREQUEST.name = "TrialHeroInfoSaveRequest"
|
||||
TRIALHEROINFOSAVEREQUEST.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest"
|
||||
TRIALHEROINFOSAVEREQUEST.nested_types = {}
|
||||
TRIALHEROINFOSAVEREQUEST.enum_types = {}
|
||||
TRIALHEROINFOSAVEREQUEST.fields = {TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD}
|
||||
TRIALHEROINFOSAVEREQUEST.fields = {TRIALHEROINFOSAVEREQUEST_HEROES_FIELD}
|
||||
TRIALHEROINFOSAVEREQUEST.is_extendable = false
|
||||
TRIALHEROINFOSAVEREQUEST.extensions = {}
|
||||
TRIALHEROINFOSAVERESPONSE_HEROES_FIELD.name = "heroes"
|
||||
|
|
@ -2377,6 +2419,7 @@ TowerRewardResponse = protobuf.Message(TOWERREWARDRESPONSE)
|
|||
TrialHeroInfo = protobuf.Message(TRIALHEROINFO)
|
||||
TrialHeroInfoSaveRequest = protobuf.Message(TRIALHEROINFOSAVEREQUEST)
|
||||
TrialHeroInfoSaveResponse = protobuf.Message(TRIALHEROINFOSAVERESPONSE)
|
||||
TrialSaveHero = protobuf.Message(TRIALSAVEHERO)
|
||||
UseAddHpItemRequest = protobuf.Message(USEADDHPITEMREQUEST)
|
||||
UseTowerBuffRequest = protobuf.Message(USETOWERBUFFREQUEST)
|
||||
UseTowerBuffResponse = protobuf.Message(USETOWERBUFFRESPONSE)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -494,6 +494,14 @@ ACTIVEUSERMOUNTREQUEST = protobuf.Descriptor();
|
|||
ACTIVEUSERMOUNTREQUEST_MOUNTID_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVEUSERMOUNTRESPONSE = protobuf.Descriptor();
|
||||
ACTIVEUSERMOUNTRESPONSE_VALIDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST = protobuf.Descriptor();
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELRESPONSE = protobuf.Descriptor();
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
|
||||
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
|
||||
|
|
@ -5001,6 +5009,81 @@ ACTIVEUSERMOUNTRESPONSE.enum_types = {}
|
|||
ACTIVEUSERMOUNTRESPONSE.fields = {ACTIVEUSERMOUNTRESPONSE_VALIDTIME_FIELD}
|
||||
ACTIVEUSERMOUNTRESPONSE.is_extendable = false
|
||||
ACTIVEUSERMOUNTRESPONSE.extensions = {}
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.activityId"
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.number = 1
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.index = 0
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.name = "equipId"
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.equipId"
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.number = 2
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.index = 1
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.name = "itemId"
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.itemId"
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.number = 3
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.index = 2
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.name = "itemNum"
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.itemNum"
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.number = 4
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.index = 3
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST.name = "EquipUpLevelRequest"
|
||||
EQUIPUPLEVELREQUEST.full_name = ".rpc.protocols.EquipUpLevelRequest"
|
||||
EQUIPUPLEVELREQUEST.nested_types = {}
|
||||
EQUIPUPLEVELREQUEST.enum_types = {}
|
||||
EQUIPUPLEVELREQUEST.fields = {EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD, EQUIPUPLEVELREQUEST_EQUIPID_FIELD, EQUIPUPLEVELREQUEST_ITEMID_FIELD, EQUIPUPLEVELREQUEST_ITEMNUM_FIELD}
|
||||
EQUIPUPLEVELREQUEST.is_extendable = false
|
||||
EQUIPUPLEVELREQUEST.extensions = {}
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.name = "result"
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.full_name = ".rpc.protocols.EquipUpLevelResponse.result"
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.number = 1
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.index = 0
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.label = 1
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.default_value = false
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.type = 8
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.cpp_type = 7
|
||||
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.name = "drop"
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.EquipUpLevelResponse.drop"
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.number = 2
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.index = 1
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.label = 1
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.default_value = nil
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.type = 11
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
EQUIPUPLEVELRESPONSE.name = "EquipUpLevelResponse"
|
||||
EQUIPUPLEVELRESPONSE.full_name = ".rpc.protocols.EquipUpLevelResponse"
|
||||
EQUIPUPLEVELRESPONSE.nested_types = {}
|
||||
EQUIPUPLEVELRESPONSE.enum_types = {}
|
||||
EQUIPUPLEVELRESPONSE.fields = {EQUIPUPLEVELRESPONSE_RESULT_FIELD, EQUIPUPLEVELRESPONSE_DROP_FIELD}
|
||||
EQUIPUPLEVELRESPONSE.is_extendable = false
|
||||
EQUIPUPLEVELRESPONSE.extensions = {}
|
||||
|
||||
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
|
||||
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
|
||||
|
|
@ -5022,6 +5105,8 @@ DailyChallengeRequest = protobuf.Message(DAILYCHALLENGEREQUEST)
|
|||
DailyChallengeResponse = protobuf.Message(DAILYCHALLENGERESPONSE)
|
||||
DelFriendRequest = protobuf.Message(DELFRIENDREQUEST)
|
||||
DirectBuyIndication = protobuf.Message(DIRECTBUYINDICATION)
|
||||
EquipUpLevelRequest = protobuf.Message(EQUIPUPLEVELREQUEST)
|
||||
EquipUpLevelResponse = protobuf.Message(EQUIPUPLEVELRESPONSE)
|
||||
ErrorMsgResponse = protobuf.Message(ERRORMSGRESPONSE)
|
||||
ExchangeCdkRequest = protobuf.Message(EXCHANGECDKREQUEST)
|
||||
FivePlayerUpdateIndication = protobuf.Message(FIVEPLAYERUPDATEINDICATION)
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ end
|
|||
function ArenaMainPanel:OnDestroy()
|
||||
SubUIManager.Close(this.UpView)
|
||||
-- 清除红点
|
||||
ClearRedPointObject(RedPointType.Arena_Shop)
|
||||
-- ClearRedPointObject(RedPointType.Arena_Shop)
|
||||
-- 调用销毁方法
|
||||
for index, logic in pairs(this.ViewLogicList) do
|
||||
if logic.OnDestroy then
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ this.MaxSkillCount = 20 -- 单个回合内最多释放20次技能
|
|||
-- 初始化
|
||||
function this.Init()
|
||||
this.CurSkillCount = 0
|
||||
-- 清除轮转方法,防止收到上一局战斗的影响
|
||||
this.TurnRoundFunc = nil
|
||||
this.Clear()
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -254,6 +254,7 @@ function LeiJiChongZhiPage:OnDestroy()
|
|||
value = nil
|
||||
end
|
||||
end
|
||||
moneyGrid = {}
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -67,9 +67,9 @@ local activityType = {
|
|||
[4305] = {
|
||||
bg = "Bg2",
|
||||
hero = {
|
||||
[1]={name="Bg2/hero1",id=10014,hero="s_shibukedang_shenjiang1"}, ----哪吒
|
||||
[2]={name="Bg2/hero3",id=10090,hero="s_shibukedang_shenjiang3"}, --阎罗王
|
||||
[3]={name="Bg2/hero2",id=10085,hero="s_shibukedang_shenjiang4"}, ----敖丙
|
||||
[1]={name="Bg2/hero1",id=10009,hero="t_tianxiangjiren_shenjiang33"}, ----哪吒
|
||||
[2]={name="Bg2/hero3",id=10003,hero="d_danxinbixue_shenjiang1"}, --阎罗王
|
||||
[3]={name="Bg2/hero2",id=10015,hero="x_xianglongfuhu_shenjiang2"}, ----敖丙
|
||||
},
|
||||
title = "s_shibukedang_zi_zh",
|
||||
helptype = HELP_TYPE.TimeLimitedCall
|
||||
|
|
@ -78,9 +78,9 @@ local activityType = {
|
|||
[4306] = {
|
||||
bg = "Bg2",
|
||||
hero = {
|
||||
[1]={name="Bg2/hero1",id=10089,hero="s_yongwangzhiqian_shenjiang1"}, ----燃灯
|
||||
[2]={name="Bg2/hero3",id=10015,hero="s_yongwangzhiqian_shenjiang3"}, --伏虎罗汉
|
||||
[3]={name="Bg2/hero2",id=10026,hero="s_yongwangzhiqian_shenjiang2"}, ----东华帝君
|
||||
[1]={name="Bg2/hero1",id=10001,hero="t_tianxiangjiren_shenjiang_fx"}, ----燃灯
|
||||
[2]={name="Bg2/hero3",id=10011,hero="y_yunchouweiwo_shenjiang1"}, --伏虎罗汉
|
||||
[3]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, ----东华帝君
|
||||
},
|
||||
title = "s_yongwangzhiqian_zi_zh",
|
||||
helptype = HELP_TYPE.TimeLimitedCall
|
||||
|
|
@ -89,9 +89,9 @@ local activityType = {
|
|||
[4307] = {
|
||||
bg = "Bg2",
|
||||
hero = {
|
||||
[1]={name="Bg2/hero1",id=10011,hero="y_yunchouweiwo_shenjiang1"}, ----雷震子
|
||||
[2]={name="Bg2/hero2",id=10041,hero="y_yunchouweiwo_shenjiang2"}, --通天教主
|
||||
[3]={name="Bg2/hero3",id=10022,hero="y_yunchouweiwo_shenjiang3"}, ----达摩
|
||||
[1]={name="Bg2/hero1",id=10018,hero="t_tianxiangjiren_shenjiang_jmm"}, ----雷震子
|
||||
[2]={name="Bg2/hero2",id=10023,hero="x_xuanjimiaosuan_shenjiang2"}, --通天教主
|
||||
[3]={name="Bg2/hero3",id=10015,hero="s_yongwangzhiqian_shenjiang3",}, ----达摩
|
||||
},
|
||||
title = "y_yunchouweiwo_zi_zh",
|
||||
helptype = HELP_TYPE.TimeLimitedCall
|
||||
|
|
|
|||
|
|
@ -76,9 +76,17 @@ function FormationEditPopup:BindEvent()
|
|||
Util.AddClick(this.BtnSure, function()
|
||||
local go=function()
|
||||
local heros={}
|
||||
--后端提交后删除
|
||||
for i, v in ipairs(choosedList) do
|
||||
table.insert(heros,v.did)
|
||||
local hero = {}
|
||||
hero.heroId = v.did
|
||||
hero.position = #choosedList + 1
|
||||
table.insert(heros,hero)
|
||||
end
|
||||
table.sort(heros,function (a,b)
|
||||
return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower
|
||||
end)
|
||||
for i = 1, #heros do
|
||||
heros[i].position = i
|
||||
end
|
||||
--后端提交后放开
|
||||
-- for i, v in ipairs(choosedList) do
|
||||
|
|
@ -96,15 +104,13 @@ function FormationEditPopup:BindEvent()
|
|||
if #choosedList <= maxNum and #choosedList > 0 then
|
||||
NetManager.TrialHeroInfoSaveRequest(heros,function(msg)
|
||||
PopupTipPanel.ShowTip(Language[10670])
|
||||
--后端提交后放开
|
||||
-- local heros = msg.heroes
|
||||
-- if heros and #heros > 1 then
|
||||
-- table.sort(heros,function (a,b)
|
||||
-- return a.position < b.position
|
||||
-- end)
|
||||
-- end
|
||||
-- MapManager.trialHeroInfo = heros
|
||||
MapManager.trialHeroInfo = msg.heroes
|
||||
local heros = msg.heroes
|
||||
if heros and #heros > 1 then
|
||||
table.sort(heros,function (a,b)
|
||||
return a.position < b.position
|
||||
end)
|
||||
end
|
||||
MapManager.trialHeroInfo = heros
|
||||
if func~=nil then --保存完毕后 将英雄did合集传递过去 此时我拥有这些英雄 不用担心英雄已被删除
|
||||
func(heros)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -52,7 +52,8 @@ function this.ShowPanelData(isTop,isAni)
|
|||
allMyAidData = MyGuildManager.GetAllGuildHelpInfo()
|
||||
this.ScrollView:SetData(allMyAidData, function (index, go)
|
||||
this.SingleHelpAidDataShow(go, allMyAidData[index])
|
||||
end)
|
||||
end,not isTop,not isAni)
|
||||
this.emptyObj:SetActive(#allMyAidData <= 0)
|
||||
end)
|
||||
else
|
||||
this.ScrollView:SetData(allMyAidData, function (index, go)
|
||||
|
|
|
|||
|
|
@ -200,6 +200,9 @@ end
|
|||
|
||||
--刷新页签数据
|
||||
function this:UpdateHeroInfoData()
|
||||
for k,v in pairs(this.PageList) do
|
||||
v:OnHide()
|
||||
end
|
||||
local starSize = Vector2.New(60,60)
|
||||
SetHeroStars(this.spLoader, this.starGrid, _curStar,2,starSize,-10,Vector2.New(0.5,0.5))
|
||||
this.heroName.text = GetLanguageStrById(heroConFigData.ReadingName)
|
||||
|
|
|
|||
|
|
@ -745,15 +745,14 @@ function this:TabBtnAction(id,actType,data)
|
|||
JumpManager.GoJump(75001)
|
||||
elseif id == FUNCTION_OPEN_TYPE.ARENA then
|
||||
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
|
||||
end
|
||||
else
|
||||
if id == 666 then
|
||||
elseif id == 93 then
|
||||
UIManager.OpenPanel(UIName.UpGradePackagePanel)
|
||||
elseif id == 668 then
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,id)
|
||||
elseif id == 667 then
|
||||
elseif id == 94 then
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,668)
|
||||
elseif id == 95 then
|
||||
UIManager.OpenPanel(UIName.TimeLimitSkinPanel)
|
||||
end
|
||||
else
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -363,13 +363,6 @@ function this.InitTrialMission()
|
|||
|
||||
end
|
||||
|
||||
-- -- 刷新临时背包数据
|
||||
-- function this.OnTempBagChanged()
|
||||
-- if CarbonManager.difficulty == 2 then
|
||||
-- this.RefreshBombNum()
|
||||
-- end
|
||||
-- end
|
||||
|
||||
-- 刷新砸炸弹、回春散数量
|
||||
function this.RefreshBombNum()
|
||||
-- 试炼副本才执行
|
||||
|
|
@ -413,22 +406,7 @@ function this.InitTrial()
|
|||
MapTrialManager.canMove = true
|
||||
MapManager.isRemoving = false
|
||||
MapManager.deadTime = 0
|
||||
-- if not MapManager.isOpen then
|
||||
-- this.TrialMissionStart()
|
||||
-- end
|
||||
end
|
||||
-- -- 试炼副本进图流程
|
||||
-- function this.TrialMissionStart()
|
||||
-- NetManager.CarbonMissionStartRequest(function(msg)
|
||||
-- Log("服务器返回消息")
|
||||
-- local showStr = "试炼副本" .. MapTrialManager.curTowerLevel .."层"
|
||||
-- UIManager.OpenPanel(UIName.CurlingTipPanel, showStr)
|
||||
-- MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos)
|
||||
-- PlayerManager.startTime = PlayerManager.serverTime
|
||||
-- MissionManager.missionTime = 0
|
||||
-- MapManager.isOpen = true
|
||||
-- end)
|
||||
-- end
|
||||
|
||||
-- 试炼副本显示时间
|
||||
function this.TrialShowTime()
|
||||
|
|
@ -500,14 +478,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
|
|||
local itemId=trialSetting[1].HealingId[1]
|
||||
local itemNum=trialSetting[1].HealingId[2]
|
||||
this.selectHero:SetActive((true) and (MapManager.curCarbonType == CarBonTypeId.TRIAL))
|
||||
-- local d={}
|
||||
-- if isFirstIn then--若是第一次进 此时我必有该英雄 不用担心是已删除英雄 通过HeroDid去获取数据
|
||||
-- for n, did in ipairs(isFirstData) do
|
||||
-- local h=HeroManager.GetSingleHeroData(did)
|
||||
-- table.insert(MapManager.trialHeroInfo,{heroId=h.dynamicId,tmpId=h.id,star=h.star,heroHp=10000,level=h.lv,skinId = h.skinId})
|
||||
-- end
|
||||
-- end
|
||||
-- d = MapManager.trialHeroInfo
|
||||
local d = MapManager.trialHeroInfo
|
||||
for k = 1, this.s_grid.transform.childCount do
|
||||
this.s_grid.transform:GetChild(k-1).gameObject:SetActive(false)
|
||||
|
|
@ -520,9 +490,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
|
|||
end
|
||||
end
|
||||
end
|
||||
-- table.sort(d,function (a,b)
|
||||
-- return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower
|
||||
-- end)
|
||||
for i, v in ipairs(d) do
|
||||
if MapTrialManager.selectHeroDid ~= "" then
|
||||
if MapTrialManager.selectHeroDid==v.heroId and v.heroHp <= 0 then
|
||||
|
|
@ -548,12 +515,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
|
|||
local choosed=Util.GetGameObject(o,"choosed")
|
||||
local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider")
|
||||
frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality, v.star))
|
||||
-- if not v.skinId or v.skinId == 0 then
|
||||
-- icon.sprite= this.spLoader:LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon))
|
||||
-- else
|
||||
-- local heroSkinData = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",v.skinId)
|
||||
-- icon.sprite= this.spLoader:LoadSprite(GetResourcePath(heroSkinData.Icon))
|
||||
-- end
|
||||
SetHeroIcon(this.spLoader, v,icon,heroConfig[v.tmpId])
|
||||
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName))
|
||||
lv.text=v.level
|
||||
|
|
|
|||
|
|
@ -366,15 +366,14 @@ function this.MapInfoRequest(mapModeId,func)
|
|||
local msg = MapInfoProto_pb.MapEnterResponse()
|
||||
msg:ParseFromString(data)
|
||||
MapManager.curMapId = msg.mapId
|
||||
----后端提交后放开
|
||||
-- local heros = msg.infos
|
||||
-- if heros then
|
||||
-- table.sort(heros,function (a,b)
|
||||
-- return a.position < b.position
|
||||
-- end)
|
||||
-- end
|
||||
-- MapManager.trialHeroInfo = heros
|
||||
MapManager.trialHeroInfo = msg.infos
|
||||
|
||||
local heros = msg.infos
|
||||
if heros then
|
||||
table.sort(heros,function (a,b)
|
||||
return a.position < b.position
|
||||
end)
|
||||
end
|
||||
MapManager.trialHeroInfo = heros
|
||||
MapTrialManager.curTowerLevel = msg.curTower
|
||||
MapTrialManager.bombUsed = msg.bombUsed
|
||||
MapTrialManager.killCount=msg.killCount
|
||||
|
|
@ -4186,10 +4185,9 @@ end
|
|||
function NetManager.TrialHeroInfoSaveRequest(heros,func)
|
||||
local data = MapInfoProto_pb.TrialHeroInfoSaveRequest()
|
||||
for i = 1, #heros do
|
||||
-- local c = data.heroes:add()--后端提交后放开
|
||||
-- c.heroId = heros[i].heroId--后端提交后放开
|
||||
-- c.position = heros[i].position--后端提交后放开
|
||||
data.heroIds:append(heros[i])
|
||||
local c = data.heroes:add()--后端提交后放开
|
||||
c.heroId = heros[i].heroId--后端提交后放开
|
||||
c.position = heros[i].position--后端提交后放开
|
||||
end
|
||||
|
||||
local msg = data:SerializeToString()
|
||||
|
|
|
|||
|
|
@ -110,15 +110,15 @@ function GrowthGiftPage:OnShow(_sortingOrder)
|
|||
else
|
||||
self.titleTip.gameObject:SetActive(false)
|
||||
end
|
||||
self:RefreshData()
|
||||
self:RefreshData(true,true)
|
||||
end
|
||||
|
||||
function GrowthGiftPage:RefreshData()
|
||||
function GrowthGiftPage:RefreshData(isTop,isAni)
|
||||
if self.actType == ActivityTypeDef.GrowthReward then
|
||||
self:SetBtnInvestState()
|
||||
self.clickFun = self.GrowthGiftPageOnClick
|
||||
end
|
||||
self:RefreshGiftData(true)
|
||||
self:RefreshGiftData(isTop,isAni)
|
||||
end
|
||||
|
||||
--设置投资按钮初始状态
|
||||
|
|
@ -137,7 +137,7 @@ function GrowthGiftPage:SetBtnInvestState()
|
|||
end
|
||||
end
|
||||
|
||||
function GrowthGiftPage:RefreshGiftData(anim)
|
||||
function GrowthGiftPage:RefreshGiftData(isTop,isAni)
|
||||
self.mission = DynamicActivityManager.GetMissionDataByActId(self.curActiId)
|
||||
if not self.missionPre then
|
||||
self.missionPre = {}
|
||||
|
|
@ -149,7 +149,7 @@ function GrowthGiftPage:RefreshGiftData(anim)
|
|||
|
||||
self.scrollView:SetData(self.mission, function(index, item)
|
||||
self:RefreshShowData(item, self.mission[index])
|
||||
end,not anim)
|
||||
end,not isTop,not isAni)
|
||||
end
|
||||
|
||||
--刷新每一条item
|
||||
|
|
@ -218,7 +218,7 @@ function GrowthGiftPage:RefreshStatus()
|
|||
-- 检测红点状态
|
||||
RedpotManager.CheckRedPointStatus(RedPointType.GrowthGift)
|
||||
-- 刷新当前界面显示
|
||||
self:RefreshData()
|
||||
self:RefreshData(false,false)
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -37,16 +37,16 @@ function this.SetBasicValues(giftGoodsList)
|
|||
giftGoodsInfoList[v] = {}
|
||||
end
|
||||
for _, giftGoodsInfo in ipairs(giftGoodsList) do
|
||||
|
||||
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
|
||||
|
||||
-- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
||||
-- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
||||
-- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
|
||||
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
|
||||
else
|
||||
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
||||
table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)
|
||||
if giftGoodsInfo.goodsId and giftGoodsInfo.goodsId ~= 0 then
|
||||
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
|
||||
-- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
||||
-- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
||||
-- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
|
||||
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
|
||||
else
|
||||
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
||||
table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ function this.InitRedPointAllRelate()
|
|||
--竞技场
|
||||
RPData:SetParent(RedPointType.Arena_Type_Normal, RedPointType.Arena)
|
||||
RPData:SetParent(RedPointType.Arena_Record, RedPointType.Arena_Type_Normal)
|
||||
RPData:SetParent(RedPointType.Arena_Shop, RedPointType.Arena_Type_Normal)
|
||||
-- RPData:SetParent(RedPointType.Arena_Shop, RedPointType.Arena_Type_Normal)
|
||||
RPData:SetParent(RedPointType.Arena_Reward, RedPointType.Arena_Type_Normal)
|
||||
RPData:SetParent(RedPointType.Arena_Free, RedPointType.Arena_Type_Normal)
|
||||
|
||||
|
|
@ -327,7 +327,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.Arena_Reward, ArenaManager.RewardBoxRedCheck)
|
||||
|
||||
---=== 商店相关红点
|
||||
RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck)
|
||||
-- RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck)
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ function EveryDayGift:BindEvent()
|
|||
FirstRechargeManager.RefreshAccumRechargeValue(1004)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
self:RefreshData()
|
||||
self:RefreshData(nil,false,false)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
|
@ -128,10 +128,10 @@ function EveryDayGift:OnShow(_sortingOrder)
|
|||
VipManager.SetGrowthPackagePointStatus()
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
end
|
||||
self:RefreshData(true)
|
||||
self:RefreshData(true,true,true)
|
||||
end
|
||||
|
||||
function EveryDayGift:RefreshData(isUpdata)
|
||||
function EveryDayGift:RefreshData(isUpdata,isTop,isAni)
|
||||
if self.actConfig.RpType > 0 then
|
||||
CheckRedPointStatus(self.actConfig.RpType)
|
||||
end
|
||||
|
|
@ -144,11 +144,11 @@ function EveryDayGift:RefreshData(isUpdata)
|
|||
self:RefreshFreeData()
|
||||
end
|
||||
-- 刷新商品数据
|
||||
self:RefreshGiftData()
|
||||
self:RefreshGiftData(isTop,isAni)
|
||||
end
|
||||
|
||||
-- 刷新礼包的数据
|
||||
function EveryDayGift:RefreshGiftData()
|
||||
function EveryDayGift:RefreshGiftData(isTop,isAni)
|
||||
rechargeNum = VipManager.GetChargedNum()--已经充值的金额
|
||||
self:isBought()
|
||||
self.scrollView:ForeachItemGO(function(index, go)
|
||||
|
|
@ -159,7 +159,7 @@ function EveryDayGift:RefreshGiftData()
|
|||
self:RefreshShowData(item, self.shopData[index],index)
|
||||
end
|
||||
local curindex = 0
|
||||
self.scrollView:SetData(self.shopData, callBack)
|
||||
self.scrollView:SetData(self.shopData, callBack,not isTop,not isAni)
|
||||
for i = 1 ,#self.shopData do
|
||||
if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then
|
||||
for j = 1 , #DynamicActivityManager.selectIndex.goodsId do
|
||||
|
|
@ -173,8 +173,8 @@ function EveryDayGift:RefreshGiftData()
|
|||
break
|
||||
end
|
||||
end
|
||||
LogGreen("curindex:"..curindex)
|
||||
self.scrollView:SetIndex(curindex)
|
||||
-- LogGreen("curindex:"..curindex)
|
||||
-- self.scrollView:SetIndex(curindex)
|
||||
end
|
||||
|
||||
function EveryDayGift:isBought()
|
||||
|
|
@ -239,6 +239,9 @@ function EveryDayGift:GetRemainTime()
|
|||
if self.shopData and #self.shopData > 0 then
|
||||
freshTime = self.shopData[#self.shopData].data.endTime
|
||||
end
|
||||
if freshTime == 0 then
|
||||
return
|
||||
end
|
||||
local UpDate = function()
|
||||
local showfreshTime = freshTime - GetTimeStamp()
|
||||
if showfreshTime > 0 then
|
||||
|
|
@ -250,6 +253,10 @@ function EveryDayGift:GetRemainTime()
|
|||
self.endTime.text = Language[11355]..formatTime--时分秒
|
||||
end
|
||||
elseif showfreshTime < 0 then
|
||||
if self.localTimer then
|
||||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
self:RefreshData(true)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ function GiftPre:BindEvent()
|
|||
CheckRedPointStatus(RedPointType.WeekGiftPage)
|
||||
CheckRedPointStatus(RedPointType.MonthGiftPage)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
self.parent:RefreshData()
|
||||
self.parent:RefreshData(nil,false,false)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
@ -129,7 +129,7 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId)
|
|||
else
|
||||
local func = function(shopType, itemId)
|
||||
ShopManager.RequestBuyShopItem(shopType, itemId, 1, function()
|
||||
self.parent:RefreshData()
|
||||
self.parent:RefreshData(nil,false,false)
|
||||
CheckRedPointStatus(RedPointType.DailyGift)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@ end
|
|||
--界面打开时调用(用于子类重写)
|
||||
function RoleInfoPanel:OnOpen(_curHeroData, _heroDatas,_isUpZhen,_index)
|
||||
curHeroData, heroDatas,isUpZhen = _curHeroData, _heroDatas,_isUpZhen
|
||||
|
||||
if _index and _index > 0 then
|
||||
_CurPageIndex = _index
|
||||
else
|
||||
|
|
@ -514,7 +515,9 @@ end
|
|||
|
||||
function this:UpdateHeroInfoData()
|
||||
this:UpdateBtnList()
|
||||
|
||||
for k,v in pairs(this.PageList) do
|
||||
v:OnHide()
|
||||
end
|
||||
if _CurPageIndex == 5 then
|
||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id)
|
||||
local HeoSkin = {}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
require("Base/BasePanel")
|
||||
RoleStoryLayout = Inherit(BasePanel)
|
||||
local this = RoleStoryLayout
|
||||
RoleStoryLayout = {}
|
||||
local curHeroData--当前英雄信息
|
||||
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
|
|
@ -19,8 +17,8 @@ end
|
|||
|
||||
--初始化组件(用于子类重写)
|
||||
function RoleStoryLayout:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.infoTextStory = Util.GetGameObject(self.gameObject ,"infoBg/infoRect/infoText"):GetComponent("Text")
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.infoTextStory = Util.GetGameObject(self.gameObject ,"infoBg/infoRect/infoText"):GetComponent("Text")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -49,9 +47,9 @@ end
|
|||
function RoleStoryLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_heroDatas)
|
||||
curHeroData = _curHerodata
|
||||
local story = curHeroData.heroConfig and curHeroData.heroConfig.HeroStory or curHeroData.HeroStory
|
||||
this.infoTextStory.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-2, 0)
|
||||
self.infoTextStory.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-2, 0)
|
||||
local stroyStr = string.gsub(GetLanguageStrById(story),"#","\n")
|
||||
this.infoTextStory.text = string.gsub(stroyStr,"|"," ")--传记
|
||||
self.infoTextStory.text = string.gsub(stroyStr,"|"," ")--传记
|
||||
end
|
||||
|
||||
function RoleStoryLayout:OnHide()
|
||||
|
|
@ -62,7 +60,7 @@ function RoleStoryLayout:OnClose()
|
|||
end
|
||||
|
||||
function RoleStoryLayout:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
self.spLoader:Destroy()
|
||||
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1054,7 +1054,7 @@ function this.CheckShopRedpot(shopType)
|
|||
CheckRedPointStatus(RedPointType.Guild_Shop)
|
||||
elseif shopType == SHOP_TYPE.ARENA_SHOP then
|
||||
CheckRedPointStatus(RedPointType.Shop_Arena_Check)
|
||||
CheckRedPointStatus(RedPointType.Arena_Shop)
|
||||
-- CheckRedPointStatus(RedPointType.Arena_Shop)
|
||||
elseif shopType == SHOP_TYPE.ROAM_SHOP then
|
||||
CheckRedPointStatus(RedPointType.Shop_Roam_Check)
|
||||
elseif shopType == SHOP_TYPE.SECRET_BOX_SHOP then
|
||||
|
|
|
|||
Loading…
Reference in New Issue