Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
afd2fac125
Binary file not shown.
|
Before Width: | Height: | Size: 454 KiB |
|
|
@ -1,110 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3419e4deecce0d74180915156142e5c8
|
||||
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: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 61334849f69154643ad7f2ee3977ab0a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/bg/ui/recruit/ui_hz_zhonghe03_47
|
||||
assetBundleVariant: unity3d
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 462 KiB |
|
|
@ -1,110 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 58324605484e15b4596505be62cb68c4
|
||||
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: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 47b6cb2a4c069834a9a7b56e0cc4fc7d
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/bg/ui/recruit/ui_hz_zhonghe03_70
|
||||
assetBundleVariant: unity3d
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 456 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 05697abe264a2bd4c9731f24bf7f261c
|
||||
guid: 3c3f51cf76ce5414c9349c6ddc78afc2
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: d3239d58c84209a42ad99507a49bd3f6
|
||||
spriteID: 82fa1f26c399350439ce92705c1ef45b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/bg/ui/recruit/ui_hz_zhonghe03_71
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 211 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a4dd189557edf88418321cc2e3e89124
|
||||
guid: e23066da756ff9c47a32c319a4efa684
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 4d591d717f5b5734a81991176fafd926
|
||||
spriteID: d29196f4f885d5b48aad23f344d110b2
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/bg/ui/recruit/ui_hz_zhonghe05_3
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -383,7 +383,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -114, y: -236}
|
||||
m_AnchoredPosition: {x: -117.99994, y: -407.5}
|
||||
m_SizeDelta: {x: 140, y: 160}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3803326489293840791
|
||||
|
|
@ -625,8 +625,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -114, y: -610}
|
||||
m_SizeDelta: {x: 140, y: 160}
|
||||
m_AnchoredPosition: {x: -114, y: -579.9}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &988307759817543788
|
||||
CanvasRenderer:
|
||||
|
|
@ -656,7 +656,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 007ce76cef3dec944b160050bce344a5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 750f3399d6d98b547ae800289ad6b69d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -842,7 +842,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -114, y: -417}
|
||||
m_AnchoredPosition: {x: -116, y: -221.5}
|
||||
m_SizeDelta: {x: 140, y: 160}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4300029144163247428
|
||||
|
|
@ -6205,8 +6205,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: -0.6, y: 2.0999985}
|
||||
m_SizeDelta: {x: 165, y: 167}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 165, y: 166}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4858013691499662153
|
||||
CanvasRenderer:
|
||||
|
|
@ -6236,7 +6236,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 384d5ca6e3d45ce41b20c213155ef132, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: f9b169a56f316274cb8884dba123c570, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -7360,7 +7360,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.74509805}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.8627451}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -10352,7 +10352,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5732832636189229457
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10674,7 +10674,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -58}
|
||||
m_AnchoredPosition: {x: 0, y: -53.4}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7647866229083857737
|
||||
|
|
@ -10864,7 +10864,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.3, y: -50.4}
|
||||
m_AnchoredPosition: {x: -0.3, y: -72.2}
|
||||
m_SizeDelta: {x: 121, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &621656461264786676
|
||||
|
|
@ -16501,10 +16501,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1820718257822173687}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 117, y: -909.9}
|
||||
m_SizeDelta: {x: 2760, y: 2160}
|
||||
m_AnchoredPosition: {x: 117, y: 76}
|
||||
m_SizeDelta: {x: 2760, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8480489074927530339
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0062cf6c49c99584cb31ab12962befda
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -14848,10 +14848,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3273770615315225594}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 193.35, y: -76.95}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &212877470159174904
|
||||
GameObject:
|
||||
|
|
@ -21011,6 +21011,7 @@ RectTransform:
|
|||
- {fileID: 6343545840538766107}
|
||||
- {fileID: 1833415466006012030}
|
||||
- {fileID: 5386874473300730168}
|
||||
- {fileID: 5134282624305924641}
|
||||
m_Father: {fileID: 307101446868176157}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -30824,6 +30825,85 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &531748391415356848
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4905398390574170718}
|
||||
- component: {fileID: 3003869194498880646}
|
||||
- component: {fileID: 6798835495096748539}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4905398390574170718
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 531748391415356848}
|
||||
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: 5134282624305924641}
|
||||
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: 81}
|
||||
m_SizeDelta: {x: 800, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3003869194498880646
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 531748391415356848}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6798835495096748539
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 531748391415356848}
|
||||
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.19607843, g: 0.19607843, b: 0.19607843, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 45
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 45
|
||||
m_Alignment: 1
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: New Text
|
||||
--- !u!1 &532948500502908785
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -167716,6 +167796,127 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5071960031057979881
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5134282624305924641}
|
||||
- component: {fileID: 4705597685332779528}
|
||||
- component: {fileID: 1746567586054503123}
|
||||
- component: {fileID: 1314485706019026148}
|
||||
- component: {fileID: 8193546994947167379}
|
||||
m_Layer: 5
|
||||
m_Name: helpFgithInfo
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5134282624305924641
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5071960031057979881}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4905398390574170718}
|
||||
m_Father: {fileID: 3031162827143993638}
|
||||
m_RootOrder: 6
|
||||
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.34, y: -0.00012207031}
|
||||
m_SizeDelta: {x: 868.34, y: 250}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4705597685332779528
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5071960031057979881}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1746567586054503123
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5071960031057979881}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Content: {fileID: 0}
|
||||
m_Horizontal: 1
|
||||
m_Vertical: 0
|
||||
m_MovementType: 1
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_Viewport: {fileID: 0}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 0}
|
||||
m_HorizontalScrollbarVisibility: 0
|
||||
m_VerticalScrollbarVisibility: 0
|
||||
m_HorizontalScrollbarSpacing: 0
|
||||
m_VerticalScrollbarSpacing: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &1314485706019026148
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5071960031057979881}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &8193546994947167379
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5071960031057979881}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||
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: 0}
|
||||
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 &5125837423737242127
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -173532,10 +173733,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3273770615315225594}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 516.65, y: -76.95}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5425342804153282005
|
||||
GameObject:
|
||||
|
|
@ -209168,10 +209369,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3273770615315225594}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 193.35, y: -231.55}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6938811548049088390
|
||||
GameObject:
|
||||
|
|
@ -209682,10 +209883,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3273770615315225594}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 355, y: -76.95}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7042731824326795275
|
||||
GameObject:
|
||||
|
|
@ -240414,10 +240615,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3273770615315225594}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 355, y: -231.55}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7738539717228930362
|
||||
GameObject:
|
||||
|
|
@ -264512,10 +264713,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3273770615315225594}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 516.65, y: -231.55}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8968110427106007469
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -37931,8 +37931,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 402.4, y: 713}
|
||||
m_SizeDelta: {x: 180, y: 174}
|
||||
m_AnchoredPosition: {x: 427.7, y: 732.8}
|
||||
m_SizeDelta: {x: 140, y: 160}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4447593369368801178
|
||||
CanvasRenderer:
|
||||
|
|
@ -37962,7 +37962,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 007ce76cef3dec944b160050bce344a5, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -38889,7 +38889,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4226315849555891466
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -49411,8 +49411,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 402.4, y: 494}
|
||||
m_SizeDelta: {x: 180, y: 174}
|
||||
m_AnchoredPosition: {x: 429, y: 558}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1831198679213159282
|
||||
CanvasRenderer:
|
||||
|
|
@ -49442,7 +49442,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 750f3399d6d98b547ae800289ad6b69d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -60105,8 +60105,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: -0.6, y: 13.4}
|
||||
m_SizeDelta: {x: 168.1, y: 137.4}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 165, y: 166}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5417627609976870197
|
||||
CanvasRenderer:
|
||||
|
|
@ -60254,7 +60254,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -36}
|
||||
m_AnchoredPosition: {x: 0, y: -64.4}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5417627610598061815
|
||||
|
|
@ -106995,7 +106995,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -36}
|
||||
m_AnchoredPosition: {x: 0, y: -53.4}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3117871871858225194
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &779243402
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -34,7 +34,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: -103.4, y: 12}
|
||||
m_AnchoredPosition: {x: -103.4, y: -2.5}
|
||||
m_SizeDelta: {x: 718, y: 1112}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &779243404
|
||||
|
|
@ -52,7 +52,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 779243401}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -91,7 +91,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &909235706
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -109,8 +109,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -1482.3, y: 18.849976}
|
||||
m_SizeDelta: {x: 340, y: 200}
|
||||
m_AnchoredPosition: {x: -1473.59, y: -5.59}
|
||||
m_SizeDelta: {x: 361.57, y: 229.29}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &909235708
|
||||
CanvasRenderer:
|
||||
|
|
@ -140,8 +140,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 595923f9a7d98db47b4e9bbc4d23e1d7, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 86550fd0746489b4a94bdf048f2b2443, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
|
@ -482,8 +482,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: -13.847, y: -57.13}
|
||||
m_SizeDelta: {x: 312.3, y: 54.19}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 312.3, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1979830588446784777
|
||||
CanvasRenderer:
|
||||
|
|
@ -506,7 +506,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.5411765, g: 0.33333334, b: 0.24705884, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -520,7 +520,7 @@ MonoBehaviour:
|
|||
m_BestFit: 1
|
||||
m_MinSize: 8
|
||||
m_MaxSize: 80
|
||||
m_Alignment: 5
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
|
|
@ -593,7 +593,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 3419e4deecce0d74180915156142e5c8, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e23066da756ff9c47a32c319a4efa684, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -788,7 +788,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: 136.9, y: 88.5}
|
||||
m_AnchoredPosition: {x: 136.6, y: 68}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1473326464953147949
|
||||
|
|
@ -839,6 +839,7 @@ GameObject:
|
|||
- component: {fileID: 7364619929460024336}
|
||||
- component: {fileID: 3750664828220443}
|
||||
- component: {fileID: 8189464279244370655}
|
||||
- component: {fileID: 2796252668090865692}
|
||||
m_Layer: 0
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
|
@ -855,14 +856,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 3133194435807104864}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: -1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3766794052347753839}
|
||||
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_AnchoredPosition: {x: 7.1, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3750664828220443
|
||||
|
|
@ -886,7 +887,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.91372555, g: 0.90196085, b: 0.8941177, a: 1}
|
||||
m_Color: {r: 1, g: 0.33490568, b: 0.33490568, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -907,6 +908,21 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5F00\u670D\u5BFB\u4ED9\u5929\u540E\u5F00\u542F"
|
||||
--- !u!114 &2796252668090865692
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3133194435807104864}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &3175102957883172638
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1008,7 +1024,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 3513376787049191475}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: -1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7364619929460024336}
|
||||
m_Father: {fileID: 6926108809955003500}
|
||||
|
|
@ -1016,8 +1032,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: 18.73, y: 12}
|
||||
m_SizeDelta: {x: 242.76, y: 53.4}
|
||||
m_AnchoredPosition: {x: 40.83, y: -76.9}
|
||||
m_SizeDelta: {x: 257.89, y: 53.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1761920585522180178
|
||||
CanvasRenderer:
|
||||
|
|
@ -1034,7 +1050,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3513376787049191475}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -1047,7 +1063,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 7047902cea7e0a644bec2bf166d4f6c1, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 224af62a153581d44a61c04e77bbaff1, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -1824,7 +1840,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 48.6, y: 106}
|
||||
m_AnchoredPosition: {x: 48.600098, y: 106}
|
||||
m_SizeDelta: {x: 99, y: 179}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4851780475586518862
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.74509805}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -406,8 +406,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: -5.3, y: 1.2}
|
||||
m_SizeDelta: {x: 168.1, y: 137.4}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 165, y: 166}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1306611388
|
||||
CanvasRenderer:
|
||||
|
|
@ -481,7 +481,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -55.8}
|
||||
m_AnchoredPosition: {x: 0, y: -68.1}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1760554366
|
||||
|
|
@ -616,15 +616,15 @@ RectTransform:
|
|||
m_GameObject: {fileID: 1190103957847382}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: 2, y: 2, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2114040022}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -21, y: 95}
|
||||
m_SizeDelta: {x: 6186.7, y: -290}
|
||||
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: 1024, y: 1024}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222544982504122848
|
||||
CanvasRenderer:
|
||||
|
|
@ -654,7 +654,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2ebe641dbaf1357458bd8d19de67b7a3, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 3c3f51cf76ce5414c9349c6ddc78afc2, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
|
|
@ -21889,7 +21889,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -465}
|
||||
m_AnchoredPosition: {x: 0, y: -128}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &3749845715119794073
|
||||
|
|
@ -37596,7 +37596,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.0012417, y: 32.500137}
|
||||
m_AnchoredPosition: {x: -0.0012417, y: 32.50022}
|
||||
m_SizeDelta: {x: 156.9, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &6680648963269486201
|
||||
|
|
@ -43324,7 +43324,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 402.4, y: 713}
|
||||
m_AnchoredPosition: {x: 427.2, y: 733.7}
|
||||
m_SizeDelta: {x: 140, y: 160}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8545088816228627475
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9ccc474aac5dca74cb9a0c570a13e38d
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -82214,7 +82214,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 49.8, y: 57.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &380452177324348719
|
||||
CanvasRenderer:
|
||||
|
|
@ -112087,7 +112087,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 49.8, y: 57.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8381269416351269648
|
||||
CanvasRenderer:
|
||||
|
|
@ -112161,7 +112161,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 49.8, y: 57.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5666295944493140231
|
||||
CanvasRenderer:
|
||||
|
|
@ -112385,7 +112385,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 49.8, y: 57.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &959366826316051383
|
||||
CanvasRenderer:
|
||||
|
|
@ -113589,8 +113589,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: 451.1, y: 174.4}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_AnchoredPosition: {x: 427.7, y: 174.4}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7686434233130170854
|
||||
CanvasRenderer:
|
||||
|
|
@ -124034,7 +124034,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 49.8, y: 57.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1328231975784304495
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -754,7 +754,7 @@ RedPointType = {
|
|||
|
||||
challengeCopy = 123, --修行挑战
|
||||
godsWayTower = 124, --封神之路,多队塔
|
||||
|
||||
HelpFight = 125, --助阵
|
||||
----礼包相关------
|
||||
Operating = 201, --运营(主界面礼包)
|
||||
CumulativeSignIn = 202, --累计签到
|
||||
|
|
@ -1858,6 +1858,7 @@ FUNCTION_OPEN_TYPE = {
|
|||
TrainBuild = 151, --特训建筑
|
||||
Mingge = 152, --命格
|
||||
Fabaojulingxinyuan = 156, --法宝巨灵招募
|
||||
HelpFight = 162, --助阵
|
||||
}
|
||||
|
||||
TaskGetBtnIconDef = {
|
||||
|
|
@ -2406,6 +2407,7 @@ FUNC_OPNE_STATE = {
|
|||
HONGMENG = "HONGMENG",
|
||||
GODWEAPON = "GODWEAPON",
|
||||
TRAINBUILD = "TRAINBUILD",
|
||||
HELPFIGHT = "HELPFIGHT",
|
||||
}
|
||||
|
||||
-- 开放功能ID作为索引键值,索引对应的字符串
|
||||
|
|
@ -2441,6 +2443,7 @@ FUNC_OPEN_STR = {
|
|||
[FUNCTION_OPEN_TYPE.HongMengZhen] = FUNC_OPNE_STATE.HONGMENG,
|
||||
[FUNCTION_OPEN_TYPE.GodWeapon] = FUNC_OPNE_STATE.GODWEAPON,
|
||||
[FUNCTION_OPEN_TYPE.TrainBuild] = FUNC_OPNE_STATE.TRAINBUILD,
|
||||
[FUNCTION_OPEN_TYPE.HelpFight] = FUNC_OPNE_STATE.HELPFIGHT,
|
||||
}
|
||||
|
||||
-- 地图中图标对应的ID
|
||||
|
|
|
|||
|
|
@ -240,6 +240,7 @@ local ManagerNames = {
|
|||
"WorldArena/GodsWayTowerManager",
|
||||
"GodWeapon/GodWeaponManager",
|
||||
"HomeLand/TrainBuildManager", --特训管理
|
||||
"HelpFight/HelpFightManager",--助战管理
|
||||
--!!!!红点管理(尽量放在最后)!!!!--
|
||||
"Player/RedpotManager",
|
||||
|
||||
|
|
|
|||
|
|
@ -301,6 +301,7 @@ ConfigName = {
|
|||
RechargeCommodityorder="RechargeCommodityorder",
|
||||
ArenaLevel = "ArenaLevel",
|
||||
ArenaRoom = "ArenaRoom",
|
||||
AssistanceConfig = "AssistanceConfig",
|
||||
}
|
||||
|
||||
require "Framework/GameDataBase"
|
||||
|
|
|
|||
|
|
@ -522,6 +522,7 @@ UIName = {
|
|||
ArenaNewRankRewardPanel = 530, --新竞技场段位奖励界面
|
||||
ArenaNewUpRankPanel = 531, --新竞技场段位提升界面
|
||||
ArenaNewTheOnePopup = 532,--新竞技场全服第一弹窗
|
||||
HelpFightPanel = 536, --助战界面
|
||||
TrainHeroAddSpeedPanel=542, --特训英雄加速
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4492e021d7009e74eab037440f35d119
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,173 @@
|
|||
require("Base/BasePanel")
|
||||
HelpFightListPanel = Inherit(BasePanel)
|
||||
local this = HelpFightListPanel
|
||||
local curSelectHeroList = {}
|
||||
local heroDataList = {}
|
||||
local curNeedRoleNum
|
||||
local openThisPanel
|
||||
local curHeroData = {}
|
||||
local isChange = false
|
||||
--初始化组件(用于子类重写)
|
||||
function HelpFightListPanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.BtnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
this.title = Util.GetGameObject(self.gameObject, "bg/title"):GetComponent("Text")
|
||||
this.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||
this.cardPre = Util.GetGameObject(self.gameObject, "item")
|
||||
this.upHero = Util.GetGameObject(self.gameObject, "upObj/upHero")
|
||||
local v = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
|
||||
|
||||
this.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,
|
||||
Util.GetGameObject(self.gameObject, "scroll").transform,
|
||||
this.cardPre, this.Scrollbar, Vector2.New(v.width, v.height), 1, 1, Vector2.New(10, 20))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 1
|
||||
this.NoneImage = Util.GetGameObject(self.gameObject, "NoneImage")
|
||||
this.NoneImage.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function HelpFightListPanel:BindEvent()
|
||||
Util.AddClick(this.BtnBack, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.mask, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function HelpFightListPanel:AddListener()
|
||||
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function HelpFightListPanel:RemoveListener()
|
||||
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
local curPos = 0
|
||||
local limitQua = 0
|
||||
local limitPro = 0
|
||||
local openPanel = nil
|
||||
function HelpFightListPanel:OnOpen(data, _openPanel)
|
||||
openPanel = _openPanel
|
||||
this.title.text = data.title
|
||||
curPos = data.pos
|
||||
limitQua = data.limitQua
|
||||
limitPro = data.limitPro
|
||||
this.RefreshWindow(data)
|
||||
end
|
||||
|
||||
function HelpFightListPanel:OnShow()
|
||||
isChange = false
|
||||
end
|
||||
|
||||
local upHeroData = nil
|
||||
function this.RefreshWindow(data)
|
||||
local heroDataList = HeroManager.GetHeroDatasByNaturalAndProfession(limitQua, limitPro)
|
||||
-- this.HeroSortData(heroDataList)
|
||||
if not heroDataList or #heroDataList < 1 then
|
||||
this.NoneImage.gameObject:SetActive(true)
|
||||
else
|
||||
this.NoneImage.gameObject:SetActive(false)
|
||||
end
|
||||
upHeroData = data.hero
|
||||
this.upHero:SetActive(data.hero ~= nil)
|
||||
this.ScrollView:SetData(heroDataList, function(index, go)
|
||||
this.OnShowSingleCardData(go, heroDataList[index], curPos, false)
|
||||
end, false, false)
|
||||
if data.hero then
|
||||
this.OnShowSingleCardData(this.upHero, data.hero, data.pos, true)
|
||||
end
|
||||
end
|
||||
|
||||
function this.OnShowSingleCardData(go, heroData, index, isUp) --isSelect 1选择 2 没选择
|
||||
Util.GetGameObject(go.transform, "posIcon"):SetActive(false)
|
||||
local frame = Util.GetGameObject(go.transform, "frame"):GetComponent("Image")
|
||||
local lvGo = Util.GetGameObject(go.transform, "lv")
|
||||
local icon = Util.GetGameObject(go.transform, "icon"):GetComponent("Image")
|
||||
local proIcon = Util.GetGameObject(go.transform, "proIcon")
|
||||
local name = Util.GetGameObject(go.transform, "name"):GetComponent("Text")
|
||||
local starGrid = Util.GetGameObject(go.transform, "star")
|
||||
local cardBtn = Util.GetGameObject(go.transform, "icon")
|
||||
local proTxt = Util.GetGameObject(go.transform, "proList/pro1"):GetComponent("Text")
|
||||
|
||||
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Natural))
|
||||
lvGo:SetActive(true)
|
||||
Util.GetGameObject(lvGo.transform, "Text"):GetComponent("Text").text = heroData.lv
|
||||
icon.sprite = this.spLoader:LoadSprite(heroData.icon)
|
||||
proIcon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
|
||||
name.text = GetLanguageStrById(heroData.heroConfig.ReadingName)
|
||||
local star, starType = heroData.GetStar(1)
|
||||
SetHeroStars(this.spLoader, starGrid, star, starType, nil, nil, Vector2.New(0, 1))
|
||||
LogError("hero star==" .. star)
|
||||
local config = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.AssistanceProperty, "Quality",
|
||||
heroData.heroConfig.Natural, "Star", heroData.star)
|
||||
local str = ""
|
||||
if config then
|
||||
for i = 1, #config.Property do
|
||||
local k = config.Property[i][1]
|
||||
local v = config.Property[i][2]
|
||||
str = str ..
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig, i).Info) .. " +" .. v .. "\n"
|
||||
end
|
||||
proTxt.text = str
|
||||
end
|
||||
Util.SetParticleSortLayer(starGrid, this.sortingOrder + 1)
|
||||
local btn_up = Util.GetGameObject(go.transform, "btn_up")
|
||||
Util.GetGameObject(go.transform, "btn_up/Text"):GetComponent("Text").text = Language[11563]
|
||||
local btn_down = Util.GetGameObject(go.transform, "btn_down")
|
||||
Util.GetGameObject(go.transform, "btn_down/Text"):GetComponent("Text").text = Language[11564]
|
||||
btn_up:SetActive(isUp == false and upHeroData == nil)
|
||||
btn_down:SetActive(isUp)
|
||||
Util.AddOnceClick(btn_up, function()
|
||||
NetManager.AssistUpDownRequest(curPos, heroData.dynamicId, 1, function()
|
||||
local data = {}
|
||||
data.hero = heroData
|
||||
data.limitQua = limitQua
|
||||
data.limitPro = limitPro
|
||||
data.pos = curPos
|
||||
this.RefreshWindow(data)
|
||||
isChange = true
|
||||
end)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(btn_down, function()
|
||||
LogError("heroData.dynamicId===" .. heroData.dynamicId)
|
||||
LogError("curpos===================" .. curPos)
|
||||
NetManager.AssistUpDownRequest(curPos, heroData.dynamicId, 2, function()
|
||||
local data = {}
|
||||
data.hero = nil
|
||||
data.limitQua = limitQua
|
||||
data.limitPro = limitPro
|
||||
data.pos = curPos
|
||||
this.RefreshWindow(data)
|
||||
isChange = true
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
function this.HeroSortData(heroData)
|
||||
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function HelpFightListPanel:OnClose()
|
||||
if isChange then
|
||||
openPanel:OnShow()
|
||||
end
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function HelpFightListPanel:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
|
||||
this.ScrollView = nil
|
||||
end
|
||||
|
||||
return HelpFightListPanel
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 12f5087bc09115c49812285e58e7d916
|
||||
timeCreated: 1548760998
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,123 @@
|
|||
HelpFightManager = {}
|
||||
local this = HelpFightManager
|
||||
local assConfig=ConfigManager.GetConfig(ConfigName.AssistanceConfig)
|
||||
|
||||
|
||||
|
||||
function this.Initialize()
|
||||
|
||||
this.upHeroList={}
|
||||
this.HelpFightList={}
|
||||
end
|
||||
|
||||
function this.InitData(msg)
|
||||
this.HelpFightList={}
|
||||
this.upHeroList={}
|
||||
for i = 1, #msg.boxs do
|
||||
local data=msg.boxs[i]
|
||||
this.HelpFightList[i]=data
|
||||
LogError("helpfight id========================="..data.id)
|
||||
table.insert(this.upHeroList,data.heroId)
|
||||
end
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HelpFight)
|
||||
end
|
||||
|
||||
function this.AddOrRemoveHero(_pos,_type,_id)
|
||||
if _type==1 then
|
||||
this.HelpFightList[_pos].heroId=_id
|
||||
table.insert(this.upHeroList,_id)
|
||||
elseif _type==2 then
|
||||
this.HelpFightList[_pos].heroId=""
|
||||
table.removebyvalue(this.upHeroList,_id)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function this.CheckRedPoint()
|
||||
for i = 1, #this.HelpFightList do
|
||||
local isCan=this.CheckRedPointByPosition(i)
|
||||
if isCan then
|
||||
return isCan
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
function this.CheckRedPointByPosition(_pos)
|
||||
if this.HelpFightList[_pos] then
|
||||
--还没有开启
|
||||
if this.HelpFightList[_pos].state==0 then
|
||||
return false
|
||||
end
|
||||
--没有英雄看有没有能上的 有就看有没有能替换的
|
||||
local list=HeroManager.GetHeroDatasByNaturalAndProfession(assConfig[_pos].Quality,assConfig[_pos].ProfessionLimit)
|
||||
if this.HelpFightList[_pos].heroId=="" or this.HelpFightList[_pos].heroId==nil then
|
||||
if assConfig[_pos] then
|
||||
if list and #list>0 then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
else
|
||||
local heroData=HeroManager.GetSingleHeroData(this.HelpFightList[_pos].heroId)
|
||||
if heroData and list and #list>0 then
|
||||
for k, v in pairs(list) do
|
||||
if v.star>heroData.star then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
--获取所有的加成属性
|
||||
function this.GetAllAddPro()
|
||||
local allAddPro={}
|
||||
local addNum=0
|
||||
for k, v in pairs(this.HelpFightList) do
|
||||
if v.heroId~="" and v.heroId~=nil then
|
||||
local heroData=HeroManager.GetSingleHeroData(v.heroId)
|
||||
if heroData then
|
||||
LogError("heroData.heroConfig.Natural==="..heroData.heroConfig.Natural)
|
||||
LogError("heroData.star==="..heroData.star)
|
||||
local config=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.AssistanceProperty,"Quality",heroData.heroConfig.Natural,"Star",heroData.star)
|
||||
if config then
|
||||
for i = 1, #config.Property do
|
||||
local key=config.Property[i][1]
|
||||
local value=config.Property[i][2]
|
||||
if allAddPro[key] then
|
||||
allAddPro[key]=allAddPro[key]+value
|
||||
else
|
||||
allAddPro[key]=value
|
||||
end
|
||||
end
|
||||
addNum=addNum+assConfig[k].PropertyUp
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if addNum>0 then
|
||||
-- LogError("addNum=================================="..addNum)
|
||||
-- for k, v in pairs(allAddPro) do
|
||||
-- LogError("k==========前============"..k.." v============"..v)
|
||||
-- end
|
||||
for k, v in pairs(allAddPro) do
|
||||
allAddPro[k]= math.floor(v*(1+addNum/10000)+0.5)
|
||||
--LogError("v==============================="..v)
|
||||
end
|
||||
end
|
||||
for k, v in pairs(allAddPro) do
|
||||
LogError("k==================="..k.." v============"..v)
|
||||
end
|
||||
|
||||
return allAddPro,addNum
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
return this
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c712ecc1e9ff640489ee41129e77069c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,181 @@
|
|||
require("Base/BasePanel")
|
||||
HelpFightPanel = Inherit(BasePanel)
|
||||
local assConfig = ConfigManager.GetConfig(ConfigName.AssistanceConfig)
|
||||
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
function HelpFightPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
|
||||
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
|
||||
self.btnBack = Util.GetGameObject(self.gameObject, "Back/BackBtn")
|
||||
self.AddProTxt = Util.GetGameObject(self.gameObject, "AddProTxt"):GetComponent("Text")
|
||||
self.helpBtn = Util.GetGameObject(self.gameObject, "HelpBtn")
|
||||
self.scrollRect = Util.GetGameObject(self.gameObject, "scroll")
|
||||
self.prefab = Util.GetGameObject(self.gameObject, "item")
|
||||
self.tipInfo = Util.GetGameObject(self.gameObject, "tipInfo"):GetComponent("Text")
|
||||
self.ScrollBar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
|
||||
local v2 = self.scrollRect:GetComponent("RectTransform").rect
|
||||
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollRect.transform, self.prefab,
|
||||
self.ScrollBar, Vector2.New(v2.width, v2.height), 1, 4, Vector2.New(70, 20))
|
||||
self.ScrollView.moveTween.MomentumAmount = 1
|
||||
self.ScrollView.moveTween.Strength = 1
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function HelpFightPanel:BindEvent()
|
||||
Util.AddClick(self.btnBack, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(self.helpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup, 146, 0, 0)
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function HelpFightPanel:AddListener()
|
||||
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function HelpFightPanel:RemoveListener()
|
||||
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function HelpFightPanel:OnOpen()
|
||||
|
||||
end
|
||||
|
||||
function HelpFightPanel:OnSortingOrderChange()
|
||||
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function HelpFightPanel:OnShow()
|
||||
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.HongMengTower })
|
||||
local list = {}
|
||||
local heroList = HelpFightManager.HelpFightList
|
||||
for key, v in ConfigPairs(assConfig) do
|
||||
--LogError("id=="..v.Id)
|
||||
local data = {}
|
||||
data.config = v
|
||||
if heroList[key].heroId ~= "" and heroList[key].heroId ~= nil then
|
||||
data.hero = HeroManager.GetSingleHeroData(heroList[key].heroId)
|
||||
end
|
||||
data.state = heroList[key].state
|
||||
list[key] = data
|
||||
end
|
||||
LogError("list len===============" .. #list)
|
||||
self.ScrollView:SetData(list, function(index, go)
|
||||
self:SingleItemDataShow(go, list[index], index)
|
||||
end)
|
||||
local addProList, addNum = HelpFightManager.GetAllAddPro()
|
||||
if #addProList == 0 then
|
||||
local aaa = { 1, 2, 3, 4 }
|
||||
for i = 1, #aaa do
|
||||
addProList[aaa[i]] = 0
|
||||
end
|
||||
end
|
||||
local str = ""
|
||||
for k, v in pairs(addProList) do
|
||||
str = str ..
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig, k).Info) ..
|
||||
" +" .. v .. " " .. string.format(Language[11565], addNum / 100)
|
||||
end
|
||||
self.AddProTxt.text = str
|
||||
--self.tipInfo.text=""
|
||||
end
|
||||
|
||||
function HelpFightPanel:SingleItemDataShow(_go, _data, _index)
|
||||
LogError("_data.id================================" .. _data.config.Id)
|
||||
local frame = Util.GetGameObject(_go, "Box/Empty/frame"):GetComponent("Image")
|
||||
local infoTxt = Util.GetGameObject(_go, "infoTxt"):GetComponent("Text")
|
||||
local lockObj = Util.GetGameObject(_go, "Box/Empty/lock")
|
||||
local tipObj = Util.GetGameObject(_go, "Box/Empty/tipInfo")
|
||||
local heroObj = Util.GetGameObject(_go, "GameObject")
|
||||
local frame1 = Util.GetGameObject(heroObj, "frame"):GetComponent("Image")
|
||||
local lvGo = Util.GetGameObject(heroObj, "lv")
|
||||
local icon = Util.GetGameObject(heroObj, "icon"):GetComponent("Image")
|
||||
local proIcon = Util.GetGameObject(heroObj, "proIcon")
|
||||
|
||||
local redPoint = Util.GetGameObject(_go, "redPoint")
|
||||
--local name = Util.GetGameObject(heroObj, "name"):GetComponent("Text")
|
||||
local starGrid = Util.GetGameObject(heroObj, "star")
|
||||
local tipTxt = Util.GetGameObject(_go, "Box/Empty/tipInfo/Text"):GetComponent("Text")
|
||||
local proTxt = Util.GetGameObject(_go, "proList/pro1"):GetComponent("Text")
|
||||
frame.sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(_data.config.Quality))
|
||||
local title = GetHeroNaturalStrByNatural(_data.config.Quality) ..
|
||||
" " .. HeroElementDef[_data.config.ProfessionLimit]
|
||||
redPoint:SetActive(HelpFightManager.CheckRedPointByPosition(_index))
|
||||
infoTxt.text = title
|
||||
lockObj:SetActive(_data.state == 0)
|
||||
tipObj:SetActive(_data.state == 0)
|
||||
local curTime = GetTimeStamp()
|
||||
local nowTime = math.floor((PlayerManager.userCreateTime + _data.config.Experience * 86400 - curTime) / 86400 + 1)
|
||||
tipTxt.text = string.format(Language[11331], nowTime)
|
||||
local proList = {}
|
||||
if _data.hero then
|
||||
heroObj:SetActive(true)
|
||||
frame1.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(_data.hero.heroConfig.Natural))
|
||||
lvGo:SetActive(true)
|
||||
Util.GetGameObject(lvGo.transform, "Text"):GetComponent("Text").text = _data.hero.lv
|
||||
icon.sprite = self.spLoader:LoadSprite(_data.hero.icon)
|
||||
proIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_data.hero.changeProId))
|
||||
--name.text = SubString2(GetLanguageStrById(_data.hero.heroConfig.ReadingName),8)
|
||||
local star, starType = _data.hero.GetStar(1)
|
||||
SetHeroStars(self.spLoader, starGrid, star, starType, nil, nil, Vector2.New(0, 1))
|
||||
Util.SetParticleSortLayer(starGrid, self.sortingOrder + 1)
|
||||
local config = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.AssistanceProperty, "Quality",
|
||||
_data.hero.heroConfig.Natural, "Star", _data.hero.star)
|
||||
if config then
|
||||
proList = config.Property
|
||||
end
|
||||
Util.AddClick(icon.gameObject, function()
|
||||
local data = {}
|
||||
data.title = title
|
||||
data.hero = _data.hero
|
||||
data.limitQua = _data.config.Quality
|
||||
data.limitPro = _data.config.ProfessionLimit
|
||||
data.pos = _index
|
||||
UIManager.OpenPanel(UIName.HelpFightListPanel, data, self)
|
||||
end)
|
||||
else
|
||||
proList = { { 1, 0 }, { 2, 0 }, { 3, 0 }, { 4, 0 } }
|
||||
heroObj:SetActive(false)
|
||||
end
|
||||
|
||||
--显示属性
|
||||
local str = ""
|
||||
for i = 1, #proList do
|
||||
local k = proList[i][1]
|
||||
local v = proList[i][2]
|
||||
str = str .. GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig, i).Info) .. " +" ..
|
||||
v .. "\n"
|
||||
end
|
||||
proTxt.text = str
|
||||
|
||||
|
||||
Util.AddClick(frame.gameObject, function()
|
||||
local data = {}
|
||||
data.title = title
|
||||
data.hero = nil
|
||||
data.limitQua = _data.config.Quality
|
||||
data.limitPro = _data.config.ProfessionLimit
|
||||
data.pos = _index
|
||||
UIManager.OpenPanel(UIName.HelpFightListPanel, data, self)
|
||||
end)
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function HelpFightPanel:OnClose()
|
||||
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function HelpFightPanel:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
SubUIManager.Close(self.UpView)
|
||||
end
|
||||
|
||||
return HelpFightPanel
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e6c3d4976093bc44c9c0496c1860d420
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -21,6 +21,7 @@ Func_Prop_Type = {
|
|||
Weapon =18, --神兵
|
||||
WeaponFetter=19, --神兵羁绊
|
||||
Gift =20, --礼物
|
||||
HelpFight = 22, --助战
|
||||
}
|
||||
|
||||
-- 计算需要缓存数据的方法
|
||||
|
|
@ -80,6 +81,14 @@ Func_Prop_Func = {
|
|||
end
|
||||
return profPropList
|
||||
end,
|
||||
--助战属性加成
|
||||
[Func_Prop_Type.HelpFight] = function()
|
||||
local allPro = HelpFightManager.GetAllAddPro()
|
||||
-- for key, value in pairs(allPro) do
|
||||
-- allPro[key] = value
|
||||
-- end
|
||||
return allPro
|
||||
end,
|
||||
-- 四象心法
|
||||
[Func_Prop_Type.FourQua] = function()
|
||||
local profPropList = {}
|
||||
|
|
@ -249,5 +258,8 @@ Func_Prop_Filter = {
|
|||
[Func_Prop_Type.WeaponFetter] = function(funcData, heroData)
|
||||
return funcData
|
||||
end,
|
||||
|
||||
--助战属性加成
|
||||
[Func_Prop_Type.HelpFight] = function(funcData, heroData)
|
||||
return funcData
|
||||
end,
|
||||
}
|
||||
|
|
@ -78,9 +78,15 @@ function this:InitComponent()
|
|||
this.decorateRoot = Util.GetGameObject(self.gameObject, "bg/decorate")
|
||||
self.ctrl = Util.GetGameObject(self.gameObject, "scene/ctrl")
|
||||
|
||||
|
||||
--新功能提示
|
||||
this.levelOpenTips = Util.GetGameObject(self.gameObject, "levelOpen")
|
||||
this.levelOpenTipsText = Util.GetGameObject(self.gameObject, "levelOpen/Text"):GetComponent("Text")
|
||||
this.timeOpenTips = Util.GetGameObject(self.gameObject, "timeOpen")
|
||||
this.timeOpenTipsText = Util.GetGameObject(self.gameObject, "timeOpen/Text"):GetComponent("Text")
|
||||
---------------topLeftPart----------------
|
||||
|
||||
--助阵
|
||||
this.btnZhuZhen = Util.GetGameObject(this.gameObject, "scene/layer7/btnZhuZhen")
|
||||
this.zhuZhenRed = Util.GetGameObject(this.gameObject, "scene/layer7/btnZhuZhen/redPoint")
|
||||
-- 七日登陆奖励预览入口
|
||||
this.sgBtn=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/seven")
|
||||
this.sgRoot=Util.GetGameObject(this.sgBtn,"sevenGift/root")
|
||||
|
|
@ -224,6 +230,7 @@ function this:InitComponent()
|
|||
[FUNCTION_OPEN_TYPE.GodWeapon] = this:AddFuncItem(this.btnXingYunTanBao, 0),--幸运探宝
|
||||
[FUNCTION_OPEN_TYPE.JumpServer] = this:AddFuncItem(this.btnJumpServer, 0),--跨服
|
||||
[FUNCTION_OPEN_TYPE.Explore] = this:AddFuncItem(this.btnExplore, 0),--探索
|
||||
[FUNCTION_OPEN_TYPE.HelpFight] = this:AddFuncItem(this.btnZhuZhen, 0), --助阵
|
||||
}
|
||||
|
||||
this.operateNewText = {
|
||||
|
|
@ -240,6 +247,7 @@ function this:InitComponent()
|
|||
[FUNCTION_OPEN_TYPE.GodWeapon] = this:InsertNewText(this.btnXingYunTanBao),--幸运探宝
|
||||
[FUNCTION_OPEN_TYPE.JumpServer] = this:InsertNewText(this.btnJumpServer),--跨服
|
||||
[FUNCTION_OPEN_TYPE.TrainBuild] = this:InsertNewText(this.btnHomeLand),--特训
|
||||
[FUNCTION_OPEN_TYPE.HelpFight] = this:InsertNewText(this.btnZhuZhen),
|
||||
}
|
||||
|
||||
-- 红点
|
||||
|
|
@ -432,7 +440,12 @@ function this:BindEvent()
|
|||
end
|
||||
this:SetPosFunc(dv2)
|
||||
end
|
||||
|
||||
Util.AddClick(this.btnZhuZhen, function()
|
||||
NetManager.AssistInfoRequest(function()
|
||||
UIManager.OpenPanel(UIName.HelpFightPanel)
|
||||
end)
|
||||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.HelpFight)
|
||||
end)
|
||||
self.moveTween.OnUpdate = setPosFunc
|
||||
self.moveTween.MomentumAmount = 1
|
||||
self.moveTween.Strength = 1
|
||||
|
|
@ -846,6 +859,7 @@ function this.BindRedPoint()
|
|||
BindRedPointObject(RedPointType.HotRank,this.hrRedPoint)
|
||||
BindRedPointObject(RedPointType.GodWeapon,this.weaponRed)
|
||||
BindRedPointObject(RedPointType.DuanQiGe,this.equipCompoundRed)
|
||||
BindRedPointObject(RedPointType.HelpFight, this.zhuZhenRed)
|
||||
end
|
||||
-- 绑定红点
|
||||
function this.ClearRedPoint()
|
||||
|
|
@ -879,6 +893,7 @@ function this.ClearRedPoint()
|
|||
ClearRedPointObject(RedPointType.HotRank,this.hrRedPoint)
|
||||
ClearRedPointObject(RedPointType.GodWeapon,this.weaponRed)
|
||||
ClearRedPointObject(RedPointType.DuanQiGe,this.equipCompoundRed)
|
||||
ClearRedPointObject(RedPointType.HelpFight, this.zhuZhenRed)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
@ -1316,6 +1331,13 @@ function this:OnShow()
|
|||
if isFirstOpen >= 2 then
|
||||
-- PlaySoundWithoutClick(SoundConfig.Sound_interface)
|
||||
end
|
||||
this:CheckNextFunctionOpen()
|
||||
if this.levelOpen then
|
||||
this.levelOpenTips:SetActive(true)
|
||||
this.levelOpenTipsText.text = this.levelOpen[1].." "..this.levelOpen[2].."级开启"
|
||||
else
|
||||
this.levelOpenTips:SetActive(false)
|
||||
end
|
||||
isFirstOpen = isFirstOpen + 1
|
||||
isRefeshIcon = true
|
||||
timePressStarted = Time.realtimeSinceStartup
|
||||
|
|
@ -1439,6 +1461,12 @@ function this.OnUpdate()
|
|||
--主城人物层级处理
|
||||
this.OnMainPlayerNPCRefresh()
|
||||
--this.CheckScreenRightRedPoint()
|
||||
if this.timeOpen then
|
||||
this.timeOpenTips:SetActive(true)
|
||||
this.timeOpenTipsText.text = this.timeOpen[1].." "..GetLeftTimeStrByDeltaTime2(this.timeOpen[2]).."后开启"
|
||||
else
|
||||
this.timeOpenTips:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
--检测屏幕右侧红点
|
||||
|
|
@ -2149,4 +2177,50 @@ function this:OnChangeTitleOrRideOrSkin()
|
|||
end
|
||||
PlayerManager.SetisRefreshMainPanelNpc(true)
|
||||
end
|
||||
function this:CheckNextFunctionOpen()
|
||||
this.timeOpen = nil
|
||||
this.levelOpen = nil
|
||||
-- 当前玩家等级
|
||||
local playerLv = 0
|
||||
local curOpenTime = 0
|
||||
local curTime = GetTimeStamp()
|
||||
for i, v in ConfigPairs(GlobalSysConfig) do
|
||||
local data = v
|
||||
if data.IsOpen == 1 and data.MainPanelShow == 1 then
|
||||
--1#创角
|
||||
--2#开服
|
||||
if data.IfOpen then
|
||||
local type = data.IfOpen[1]
|
||||
local dayNum = data.IfOpen[2]
|
||||
if type == 1 then
|
||||
local openTime = PlayerManager.userCreateTime + dayNum * 24 * 60 * 60
|
||||
if curTime < openTime and (curOpenTime > openTime or curOpenTime == 0) then
|
||||
curOpenTime = openTime
|
||||
this.timeOpen = {v.Name,curOpenTime - curTime}
|
||||
end
|
||||
elseif type == 2 then
|
||||
local openTime = PlayerManager.GetServerOpenTime() + dayNum * 24 * 60 * 60
|
||||
if curTime < openTime and (curOpenTime > openTime or curOpenTime == 0) then
|
||||
curOpenTime = openTime
|
||||
this.timeOpen = {v.Name,curOpenTime - curTime}
|
||||
end
|
||||
end
|
||||
else
|
||||
--开启规则
|
||||
--1关卡开启
|
||||
--2玩家等级开启
|
||||
--3鸿蒙阵神将等级
|
||||
--4购买礼包开启
|
||||
--6修行等级
|
||||
local openRule = data.OpenRules
|
||||
if openRule then
|
||||
if openRule[1] == 2 and PlayerManager.level < openRule[2] and (playerLv > openRule[2] or playerLv == 0)then
|
||||
playerLv = openRule[2]
|
||||
this.levelOpen = {v.Name,openRule[2]}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return MainPanel
|
||||
|
|
@ -164,7 +164,8 @@ function this.RegisterMessage(network)
|
|||
socket:RegistNetMessage(MessageTypeProto_pb.COMPARENUM_DATA_INDICATION,this.CompareNumDataIndication)
|
||||
--新命格
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.GemNewInfoIndication,this.NewGemInfoIndition)
|
||||
|
||||
--助阵
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.AssistInfoIndication,this.HelpFightIndition)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -177,7 +178,15 @@ function this.NewArenaIndition(buff)
|
|||
PlayerManager.arenaTheOne=msg
|
||||
--UIManager.OpenPanel(UIName.ArenaNewTheOnePopup,msg)
|
||||
end
|
||||
|
||||
--助阵推送
|
||||
function this.HelpFightIndition(buff)
|
||||
local data = buff:DataByte()
|
||||
local msg = HeroInfoProto_pb.AssistInfoResponse()
|
||||
msg:ParseFromString(data)
|
||||
LogError("接受到新的助阵的 indition")
|
||||
HelpFightManager.InitData(msg)
|
||||
|
||||
end
|
||||
|
||||
--新的命格推送
|
||||
function this.NewGemInfoIndition(buff)
|
||||
|
|
|
|||
|
|
@ -8003,7 +8003,56 @@ function NetManager.MoneyBuyGiftRequest(_id,func)
|
|||
end
|
||||
end)
|
||||
end
|
||||
--助阵*****************
|
||||
--获取助战信息
|
||||
function NetManager.AssistInfoRequest(_func)
|
||||
local isOpen = CheckFunctionOpen(FUNCTION_OPEN_TYPE.HelpFight)
|
||||
if isOpen == false then
|
||||
if _func then
|
||||
_func()
|
||||
end
|
||||
return
|
||||
end
|
||||
local data = HeroInfoProto_pb.AssistInfoRequest()
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.AssistInfoRequest, MessageTypeProto_pb.AssistInfoResponse, msg,
|
||||
function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = HeroInfoProto_pb.AssistInfoResponse()
|
||||
msg:ParseFromString(data)
|
||||
|
||||
HelpFightManager.InitData(msg)
|
||||
if _func then
|
||||
_func()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--上下阵助战
|
||||
function NetManager.AssistUpDownRequest(_id, _heroId, _type, _func)
|
||||
local data = HeroInfoProto_pb.AssistUpDownRequest()
|
||||
data.id = _id
|
||||
data.heroId = _heroId
|
||||
data.operate = _type
|
||||
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.AssistUpDownRequest, MessageTypeProto_pb.AssistUpDownResponse,
|
||||
msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
|
||||
HelpFightManager.AddOrRemoveHero(_id, _type, _heroId)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HelpFight)
|
||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
if oldWarPower ~= tempPower then
|
||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2, { oldValue = oldWarPower, newValue = tempPower })
|
||||
end
|
||||
--HelpFightManager.InitData(msg)
|
||||
if _func then
|
||||
_func()
|
||||
end
|
||||
end)
|
||||
end
|
||||
--特训加速
|
||||
function NetManager.TrainingPropSpeedRequest(_type,_itemId,_num,_heroId,func)
|
||||
local data=HeroInfoProto_pb.TrainingPropSpeedRequest()
|
||||
|
|
|
|||
|
|
@ -724,6 +724,7 @@ function this.RegisterRedCheckFunc()
|
|||
--锻器阁
|
||||
RPData:AddCheckFunc(RedPointType.HeroGiftCompound,GiftManager.CheckHeroGiftComRed)
|
||||
RPData:AddCheckFunc(RedPointType.PlayerGiftCompound,GiftManager.CheckPlayerGiftComRed)
|
||||
RPData:AddCheckFunc(RedPointType.HelpFight, HelpFightManager.CheckRedPoint)
|
||||
end
|
||||
|
||||
-- 向红点绑定物体
|
||||
|
|
|
|||
|
|
@ -50,6 +50,10 @@ function this:BindEvent()
|
|||
PopupTipPanel.ShowTip("请不要选择同一个英雄!")
|
||||
return
|
||||
end
|
||||
if CheckListIsContainValue1(HelpFightManager.upHeroList, selectHero1) or CheckListIsContainValue1(HelpFightManager.upHeroList, selectHero2) then
|
||||
PopupTipPanel.ShowTip("请在助阵功能中下阵再进行置换")
|
||||
return
|
||||
end
|
||||
NetManager.SendHeroChangeRequest(selectHero1,selectHero2,useItemId,function()
|
||||
PopupTipPanel.ShowTip("置换成功!")
|
||||
self:ClosePanel()
|
||||
|
|
|
|||
|
|
@ -136,7 +136,13 @@ local InfoBtns = {
|
|||
this.GiftInfoShow(data, obj)
|
||||
end
|
||||
},
|
||||
|
||||
[7] = {
|
||||
name = "助 阵",
|
||||
gridName = "helpFgithInfo",
|
||||
func = function(data, obj)
|
||||
this.HelpFightInfoShow(data, obj)
|
||||
end
|
||||
},
|
||||
}
|
||||
|
||||
local curPlayerName = ""
|
||||
|
|
@ -217,6 +223,8 @@ function PlayerInfoPopup:InitComponent()
|
|||
this.InfoBtnsList = {}
|
||||
this.ItemPreList = {}
|
||||
this.ItemList = {}
|
||||
this.helpFightTxt = Util.GetGameObject(self.transform, "tipImage/panel/InfoGrids/Bg/helpFgithInfo/Text")
|
||||
:GetComponent("Text")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -829,7 +837,18 @@ function this.GiftInfoShow(teamInfo, Grid)
|
|||
Grid:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
||||
end
|
||||
end
|
||||
|
||||
--助战信息
|
||||
function this.HelpFightInfoShow(teamInfo, Grid)
|
||||
LogError("HelpFightInfoShow==========================" .. teamInfo.assistAdd)
|
||||
local str = ""
|
||||
for i = 1, #teamInfo.assistAttribute do
|
||||
local v = teamInfo.assistAttribute[i]
|
||||
str = str ..
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig, v.propertyId).Info) ..
|
||||
" +" .. v.propertyValue .. string.format(Language[12173], teamInfo.assistAdd / 100)
|
||||
end
|
||||
this.helpFightTxt.text = str
|
||||
end
|
||||
--============================底部按钮显示===========================
|
||||
function this.RefreshBtnShow()
|
||||
this.btnBox:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -490,7 +490,7 @@ function this:PageOnChange(isShow)
|
|||
for i = 1, #this.itemList do
|
||||
if this.itemList[i].pageIndex == self.curPage then
|
||||
this.select.transform:SetParent(this.itemList[i].go.transform)
|
||||
this.select.transform:GetComponent("RectTransform").anchoredPosition = Vector3.New(-15, 0, 0)
|
||||
this.select.transform:GetComponent("RectTransform").anchoredPosition = Vector3.New(0, -17, 0)
|
||||
this.select.gameObject:SetActive(true)
|
||||
this.selectIma.sprite = this.spLoader:LoadSprite(self.dicData[self.curPage].Icon[2])
|
||||
this.itemList[i].tipObj.transform:SetAsLastSibling()
|
||||
|
|
|
|||
|
|
@ -184,6 +184,10 @@ function RoleInfoPanel:BindEvent()
|
|||
PopupTipPanel.ShowTip(Language[12263])
|
||||
return
|
||||
end
|
||||
if CheckListIsContainValue1(HelpFightManager.upHeroList, curHeroData.dynamicId) then
|
||||
PopupTipPanel.ShowTip("请在助阵功能中下阵再进行回退")
|
||||
return
|
||||
end
|
||||
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
|
||||
PopupTipPanel.ShowTip(Language[12184])
|
||||
return
|
||||
|
|
|
|||
|
|
@ -475,6 +475,9 @@ function RoleUpStarLayout:StarUpClick()
|
|||
NetManager.HeroUpStarEvent(curHeroData.dynamicId,upStarConsumeMaterial ,function (msg)
|
||||
UIManager.OpenPanel(UIName.RoleUpStarSuccessPanel,curHeroData,upStarRankUpConfig.Id,upStarRankUpConfig.OpenLevel,function ()
|
||||
local dropItemTabs = BagManager.GetTableByBackDropData(msg)
|
||||
if CheckListIsContainValue1(HelpFightManager.upHeroList, curHeroData.dynamicId) then
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HelpFight)
|
||||
end
|
||||
if #dropItemTabs > 0 then
|
||||
BagManager.SetDropIsSHowEquipPrint(false)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1, function ()
|
||||
|
|
|
|||
Loading…
Reference in New Issue