特训提交
parent
63cd4f39b9
commit
87734b56ee
Binary file not shown.
After Width: | Height: | Size: 4.8 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f56ac90088d7ac44ea4718d740e54e7b
|
||||
guid: 920c410728fc55d41ae9a8d202f2493c
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
@ -64,7 +64,7 @@ TextureImporter:
|
|||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 100
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
|
@ -91,24 +91,13 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 986241f5c544a6540b8815a8abd01d2b
|
||||
spriteID: cf9114bbb5660c647abdac58cc1930fb
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -117,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/bgnc/dl_ui_effect_bg_xipu
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 2.7 MiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d2433acf08602cd4eace49c588a29458
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 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: 0e4bf3723d14ffb498e427579ecd761f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f0125b4d5d25c964686714a9242ec5da
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 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: 7ce93ab3fadc49847b68a98ed44507dc
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Before Width: | Height: | Size: 2.9 MiB |
File diff suppressed because it is too large
Load Diff
|
@ -1,5 +1,235 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &382367792
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 382367793}
|
||||
- component: {fileID: 382367795}
|
||||
- component: {fileID: 382367794}
|
||||
m_Layer: 5
|
||||
m_Name: TextImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &382367793
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 382367792}
|
||||
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: 1404586854}
|
||||
m_Father: {fileID: 431899907}
|
||||
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: -348, y: 132}
|
||||
m_SizeDelta: {x: 402, y: 234}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &382367795
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 382367792}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &382367794
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 382367792}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 6f9a2d5a1d9e8a64abe8a4e1c5d9c8e5, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &431899906
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 431899907}
|
||||
- component: {fileID: 431899909}
|
||||
- component: {fileID: 431899908}
|
||||
m_Layer: 5
|
||||
m_Name: NoneImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &431899907
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 431899906}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 382367793}
|
||||
m_Father: {fileID: 1144205945161580827}
|
||||
m_RootOrder: 18
|
||||
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: 173, y: -123}
|
||||
m_SizeDelta: {x: 354, y: 470}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &431899909
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 431899906}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &431899908
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 431899906}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2df2051012458ac4483650ef3edb3a81, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1404586853
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1404586854}
|
||||
- component: {fileID: 1404586856}
|
||||
- component: {fileID: 1404586855}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1404586854
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1404586853}
|
||||
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: 382367793}
|
||||
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: -3.8, y: 10.6}
|
||||
m_SizeDelta: {x: 292.3, y: 92.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1404586856
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1404586853}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1404586855
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1404586853}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607845, g: 0.19607845, b: 0.19607845, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 51
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u65E0\u53EF\u7279\u8BAD\u82F1\u96C4"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &930126697094742280
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1337,6 +1567,7 @@ RectTransform:
|
|||
- {fileID: 4008995303529317995}
|
||||
- {fileID: 5383541550361436563}
|
||||
- {fileID: 9044094199002741728}
|
||||
- {fileID: 431899907}
|
||||
m_Father: {fileID: 1144205945237370332}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -2800,6 +3031,9 @@ RectTransform:
|
|||
- {fileID: 1144205945447428571}
|
||||
- {fileID: 1144205944544959123}
|
||||
- {fileID: 1144205945547051221}
|
||||
- {fileID: 3130855006819598759}
|
||||
- {fileID: 6801421654597680702}
|
||||
- {fileID: 2228273608127164231}
|
||||
m_Father: {fileID: 1144205944757449781}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -4657,6 +4891,160 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2114564043805173825
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7858970349448846028}
|
||||
- component: {fileID: 3835150747174274958}
|
||||
- component: {fileID: 1279687280537635715}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7858970349448846028
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2114564043805173825}
|
||||
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: 6801421654597680702}
|
||||
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.45001, y: -0.0012529}
|
||||
m_SizeDelta: {x: 106.86, y: 23.15}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3835150747174274958
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2114564043805173825}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1279687280537635715
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2114564043805173825}
|
||||
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.9528302, g: 0.9483357, b: 0.9483357, 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: 21
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u7279\u8BAD\u7B49\u7EA7\u4E8C"
|
||||
--- !u!1 &2330522850305461654
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3130855006819598759}
|
||||
- component: {fileID: 8144686025321173122}
|
||||
- component: {fileID: 1286674463993423230}
|
||||
m_Layer: 5
|
||||
m_Name: lvBg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3130855006819598759
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2330522850305461654}
|
||||
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: 7134021790647903502}
|
||||
m_Father: {fileID: 1144205945842127862}
|
||||
m_RootOrder: 5
|
||||
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: 48, y: -61}
|
||||
m_SizeDelta: {x: 48, y: 32}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8144686025321173122
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2330522850305461654}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1286674463993423230
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2330522850305461654}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: c73ac4f44d9a7194488674d4fa335c10, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2389583162006202624
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5065,6 +5453,86 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u5F00\u59CB\u7279\u8BAD"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &5208359346887161930
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2228273608127164231}
|
||||
- component: {fileID: 2018750846007458256}
|
||||
- component: {fileID: 2847028854407501832}
|
||||
m_Layer: 5
|
||||
m_Name: name
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2228273608127164231
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5208359346887161930}
|
||||
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: 0}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1144205945842127862}
|
||||
m_RootOrder: 7
|
||||
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: -88}
|
||||
m_SizeDelta: {x: 64.4, y: 37.51}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2018750846007458256
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5208359346887161930}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2847028854407501832
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5208359346887161930}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.6509434, g: 0.47439975, b: 0.18729973, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 27
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5B59\u609F\u7A7A"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &5259790903750687675
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5144,6 +5612,176 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 50
|
||||
--- !u!1 &6037607185673778692
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7134021790647903502}
|
||||
- component: {fileID: 5169606548489019745}
|
||||
- component: {fileID: 8488072021299258794}
|
||||
- component: {fileID: 3422690913675532391}
|
||||
m_Layer: 5
|
||||
m_Name: lv
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7134021790647903502
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6037607185673778692}
|
||||
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: 3130855006819598759}
|
||||
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.59}
|
||||
m_SizeDelta: {x: 33.7, y: 20.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5169606548489019745
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6037607185673778692}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8488072021299258794
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6037607185673778692}
|
||||
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.9811321, g: 0.9579922, b: 0.9579922, 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: 20
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 999
|
||||
--- !u!114 &3422690913675532391
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6037607185673778692}
|
||||
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 &6733419847402099612
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6801421654597680702}
|
||||
- component: {fileID: 5449091857324118448}
|
||||
- component: {fileID: 4206734121465355097}
|
||||
m_Layer: 5
|
||||
m_Name: trainLvBg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6801421654597680702
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6733419847402099612}
|
||||
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: 7858970349448846028}
|
||||
m_Father: {fileID: 1144205945842127862}
|
||||
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: 15.919952, y: 57.72502}
|
||||
m_SizeDelta: {x: 107.76, y: 23.15}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5449091857324118448
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6733419847402099612}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4206734121465355097
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6733419847402099612}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: a40c39d20c3dbcb419e836a687d8dcdd, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8987217365987308059
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -48,7 +48,6 @@ function TrainBuildLvUpPanel:BindEvent()
|
|||
Util.AddClick(this.fastDoneBtn, function()
|
||||
-- local priviId = PrivilegeManager.GetPrivilegeRemainValue()
|
||||
TrainBuildManager.ResumeCost(data.dataSingle,string.split(costOneSec,"#"),function (num)
|
||||
|
||||
MsgPanel.ShowTwo(string.format("是否花费%s妖晶立即升级?",num),function() end,function()
|
||||
NetManager.TrainingArchitectureUpRequest(data.dataMain.Id,2,function ()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.UI.OnUpdateData)
|
||||
|
|
|
@ -13,7 +13,7 @@ function this.Initialize()
|
|||
this.BuildData[configData.Id].dataMain = configData--HomeLand中数据
|
||||
if configData.LvupCostPool > 0 then
|
||||
this.BuildData[configData.Id].id=configData.Id
|
||||
this.BuildData[configData.Id].level = 1 --等级
|
||||
this.BuildData[configData.Id].level = 0 --等级
|
||||
local singledata = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainBuildLevel,"PoolID",configData.Id,"level",this.BuildData[configData.Id].level)
|
||||
this.BuildData[configData.Id].dataSingle = singledata--HomeLandLevel中数据
|
||||
this.BuildData[configData.Id].startTime = 0 --资源开始积攒的时间
|
||||
|
@ -89,12 +89,13 @@ function this.GetServerData(msg,func)
|
|||
this.BuildData[value.id].endTime=0
|
||||
this.BuildData[value.id].heroId = value.heroId
|
||||
this.BuildData[value.id].heroStarTime = value.heroStartTime
|
||||
LogError("value.lv===================="..value.lv.." value.id====="..value.id)
|
||||
local singledata = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainBuildLevel,"PoolID",value.id,"level",value.lv)
|
||||
if value.startTime>0 then
|
||||
this.BuildData[value.id].endTime=value.startTime+singledata.Time
|
||||
end
|
||||
this.BuildData[value.id].dataSingle = singledata
|
||||
if value.heroId then
|
||||
if value.heroId and value.heroId~="" then
|
||||
table.insert(this.trainHeroId,value.heroId)
|
||||
end
|
||||
--end
|
||||
|
@ -143,7 +144,7 @@ function this.ResumeCost(_data,_str,func)
|
|||
end
|
||||
if _str then--立即完成
|
||||
-- LogGreen(tostring(_data.Time).." "..tostring(tonumber(_str[1])).." "..tonumber(_str[3]))
|
||||
data[16] = math.ceil(_data.Time/60)*tonumber(_str[2])
|
||||
data[16] = math.ceil(_data.Time/60)*tonumber(_str[2])
|
||||
end
|
||||
for key, value in pairs(data) do
|
||||
-- LogGreen(string.format("需要%s: %s,现有:%s",key,value,BagManager.GetTotalItemNum(key)))
|
||||
|
@ -174,14 +175,32 @@ end
|
|||
--==============================红点检测==============================
|
||||
--烦人的红点检测(我决定1-4写一个、5写一个,6写一个、任务写一个、7移植过来,然后写个总的检测跑一遍所有)
|
||||
function this.CheckRedMain()
|
||||
if this.Check1to5Building() then
|
||||
return true
|
||||
end
|
||||
if this.CheckMission() then
|
||||
return true
|
||||
end
|
||||
if this.CheckEquipUpgrade() then
|
||||
return true
|
||||
for k, v in pairs(this.BuildData) do
|
||||
if v.heroId and v.heroId~="" and v.heroStarTime then
|
||||
local pos=k
|
||||
local max=0
|
||||
local curValue=0
|
||||
local heroData=HeroManager.GetSingleHeroData(v.heroId)
|
||||
local train=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",heroData.heroConfig.Id,"Level",heroData.HeroTraining.trainingLv)
|
||||
if train then
|
||||
local aaa=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",train.TrainSettingID,"Level",heroData.HeroTraining.trainingLv)
|
||||
if pos==1 then
|
||||
max=aaa.TrainExp1
|
||||
curValue=heroData.HeroTraining.attackExp
|
||||
elseif pos==2 then
|
||||
max=aaa.TrainExp2
|
||||
curValue=heroData.HeroTraining.defenseExp
|
||||
elseif pos==3 then
|
||||
max=aaa.TrainExp3
|
||||
curValue=heroData.HeroTraining.hpExp
|
||||
end
|
||||
end
|
||||
local endTime=v.heroStarTime+math.ceil((max-curValue)/v.dataSingle.Gain)*60
|
||||
local leftTime=endTime-GetTimeStamp()
|
||||
if leftTime<=0 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
|
|
@ -120,15 +120,10 @@ function TrainBuildPanel:BindEvent()
|
|||
end)
|
||||
--打开信息界面
|
||||
Util.AddOnceClick(self.mapData[i].btnDetail,function ()
|
||||
UIManager.OpenPanel(UIName.TrainSelectHeroPanel,TrainBuildManager.BuildData[i])
|
||||
end)
|
||||
|
||||
|
||||
|
||||
|
||||
UIManager.OpenPanel(UIName.TrainSelectHeroPanel,TrainBuildManager.BuildData[i],self.mapData[i].trainLeftTime)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
function TrainBuildPanel:AddListener()
|
||||
|
@ -144,7 +139,7 @@ end
|
|||
|
||||
--待功能扩展(试图打开某个状态)
|
||||
function TrainBuildPanel:OnOpen()
|
||||
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.HomeLand })
|
||||
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
|
||||
end
|
||||
|
||||
|
||||
|
@ -179,6 +174,7 @@ function TrainBuildPanel:SetBuildsState()
|
|||
curObj.data = TrainBuildManager.BuildData[i]
|
||||
curObj.OpenLimit:SetActive(true)
|
||||
curObj.Lock:SetActive(true)
|
||||
curObj.RedPoint:SetActive(false)
|
||||
curObj.btnUpgrade:SetActive(false)
|
||||
curObj.levelImg:SetActive(false)
|
||||
curObj.Name.text=data.dataMain.Name
|
||||
|
@ -186,7 +182,7 @@ function TrainBuildPanel:SetBuildsState()
|
|||
curObj.effect1:SetActive(false)
|
||||
curObj.updateTime:SetActive(false)
|
||||
curObj.CanGet:SetActive(false)
|
||||
curObj.btnDetail:SetActive(data.dataSingle.Position>0)
|
||||
curObj.btnDetail:SetActive(false)
|
||||
curObj.trainTime:SetActive(false)
|
||||
Util.SetParticleSortLayer(curObj.effect1,self.sortingOrder + 1)
|
||||
Util.SetParticleSortLayer(curObj.effect2,self.sortingOrder + 1)
|
||||
|
@ -208,6 +204,7 @@ function TrainBuildPanel:SetBuildsState()
|
|||
end
|
||||
end
|
||||
if data.dataSingle then
|
||||
curObj.btnDetail:SetActive(data.dataSingle.Position>0)
|
||||
if data.endTime > GetTimeStamp() then--如果有结束时间说明在升级,可以取消,可以加速
|
||||
curObj.effect1:SetActive(true)
|
||||
curObj.updateTime:SetActive(true)
|
||||
|
@ -223,7 +220,7 @@ function TrainBuildPanel:SetBuildsState()
|
|||
end
|
||||
end
|
||||
if data.heroId and data.heroId~="" then
|
||||
LogError("data.heroid====================="..data.heroId)
|
||||
--LogError("data.heroid====================="..data.heroId)
|
||||
local heroData=HeroManager.GetSingleHeroData(data.heroId)
|
||||
curObj.Icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
local pos=data.dataSingle.Position
|
||||
|
@ -243,16 +240,32 @@ function TrainBuildPanel:SetBuildsState()
|
|||
curValue=heroData.HeroTraining.hpExp
|
||||
end
|
||||
end
|
||||
LogError("curvalue==========================="..curValue)
|
||||
--LogError("curvalue==========================="..curValue)
|
||||
local endTime=data.heroStarTime+math.ceil((max-curValue)/data.dataSingle.Gain)*60
|
||||
-- if not curObj.OpenLimit.activeInHierarchy then
|
||||
-- curObj.showTime = data.startTime + 60
|
||||
-- curObj.CanGet:SetActive(data.startTime + 60 < GetTimeStamp())
|
||||
-- end
|
||||
curObj.trainLeftTime=endTime-GetTimeStamp()
|
||||
LogError("endtime=================================="..endTime.." trainLeftTime=="..curObj.trainLeftTime)
|
||||
--LogError("endtime=================================="..endTime.." trainLeftTime=="..curObj.trainLeftTime)
|
||||
curObj.CanGet:SetActive(true)
|
||||
PlayUIAnim(curObj.CanGet)
|
||||
Util.AddOnceClick(curObj.CanGet,function ()
|
||||
if curObj.trainLeftTime>0 then
|
||||
local sureFunc=function()
|
||||
NetManager.TrainingRequest(data.dataMain.Id,data.heroId,2,function ()
|
||||
self:OnShow()
|
||||
end)
|
||||
end
|
||||
local args={}
|
||||
args[1]="特训未完成是否提前结束?"
|
||||
args[2]="结束"
|
||||
args[3]="取消"
|
||||
args[4]=sureFunc
|
||||
UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args)
|
||||
else
|
||||
NetManager.TrainingRequest(data.dataMain.Id,data.heroId,2,function ()
|
||||
self:OnShow()
|
||||
end)
|
||||
end
|
||||
|
||||
end)
|
||||
else
|
||||
curObj.trainLeftTime=-1
|
||||
end
|
||||
|
@ -260,9 +273,7 @@ function TrainBuildPanel:SetBuildsState()
|
|||
curObj.limitText.text = "暂未开放"
|
||||
end
|
||||
|
||||
Util.AddOnceClick(curObj.CanGet,function ()
|
||||
NetManager.TrainingRequest()
|
||||
end)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -296,13 +307,20 @@ function TrainBuildPanel:SetTime()
|
|||
end
|
||||
end
|
||||
if curObj.trainLeftTime >= 0 then
|
||||
LogError("curObj.trainLeftTime==="..curObj.trainLeftTime)
|
||||
--LogError("curObj.trainLeftTime==="..curObj.trainLeftTime)
|
||||
curObj.trainTimeTxt.text = TimeToFelaxible(curObj.trainLeftTime)
|
||||
curObj.trainLeftTime = curObj.trainLeftTime -1
|
||||
curObj.trainTime:SetActive(true)
|
||||
if curObj.trainLeftTime < 0 then
|
||||
--curObj.effect2:SetActive(true)
|
||||
curObj.trainTimeTxt.text="已完成"
|
||||
curObj.trainTimeTxt.text="特训完成"
|
||||
curObj.RedPoint:SetActive(true)
|
||||
end
|
||||
else
|
||||
if curObj.data.heroId and curObj.data.heroId~="" then
|
||||
curObj.trainTime:SetActive(true)
|
||||
curObj.trainTimeTxt.text="特训完成"
|
||||
curObj.RedPoint:SetActive(true)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@ local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
|||
local this=TrainSelectHeroPanel
|
||||
local buildData=nil
|
||||
local curHeroId=nil
|
||||
local leftTime=-1
|
||||
function this:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.btn_close = Util.GetGameObject(self.gameObject,"bg/btn_close")
|
||||
|
@ -41,8 +42,10 @@ function this:InitComponent()
|
|||
self.itemList[j] = {}
|
||||
self.tabListObj[j] = Util.GetGameObject(self.gameObject,"Tabs/grid/Btn"..j)
|
||||
end
|
||||
|
||||
|
||||
self.noneObj=Util.GetGameObject(self.gameObject,"NoneImage")
|
||||
|
||||
Util.GetGameObject(self.gameObject,"NoneImage/TextImage/Text"):GetComponent("Text").text="暂无可特训英雄"
|
||||
self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition
|
||||
end
|
||||
|
||||
|
@ -56,7 +59,7 @@ function this:BindEvent()
|
|||
|
||||
|
||||
Util.AddOnceClick(self.btn_close,function ()
|
||||
LogError("点击确定按钮")
|
||||
--LogError("点击确定按钮")
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddOnceClick(self.btn_star,function ()
|
||||
|
@ -98,17 +101,13 @@ end
|
|||
|
||||
|
||||
|
||||
function this:OnOpen(_data)
|
||||
function this:OnOpen(_data,_leftTime)
|
||||
buildData=_data
|
||||
self.title.text=buildData.dataMain.Name
|
||||
self.infoTxt.text=buildData.dataMain.Name.."每分钟增加"..buildData.dataSingle.Gain.."特训经验"
|
||||
leftTime=_leftTime
|
||||
curHeroId=buildData.heroId
|
||||
LogError("buildData.dataMain.Id==="..buildData.dataMain.Id)
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
self.btn_star:SetActive(false)
|
||||
else
|
||||
self.btn_star:SetActive(true)
|
||||
end
|
||||
--LogError("buildData.dataMain.Id==="..buildData.dataMain.Id)
|
||||
end
|
||||
function this:OnShow()
|
||||
this:Refresh(true,false)
|
||||
|
@ -127,6 +126,10 @@ function this:SetUpHero()
|
|||
local proIcon = Util.GetGameObject(go, "proIcon"):GetComponent("Image")
|
||||
local starGrid = Util.GetGameObject(go, "star")
|
||||
local choosed = Util.GetGameObject(go, "choosed")
|
||||
local lv = Util.GetGameObject(go, "lvBg/lv"):GetComponent("Text")
|
||||
local name = Util.GetGameObject(go, "name"):GetComponent("Text")
|
||||
local trainLv=Util.GetGameObject(go, "trainLvBg/Text"):GetComponent("Text")
|
||||
local trainObj=Util.GetGameObject(go, "trainLvBg")
|
||||
local heroId = curHeroId
|
||||
choosed:SetActive(false)
|
||||
if heroId and heroId~="" then
|
||||
|
@ -135,32 +138,93 @@ function this:SetUpHero()
|
|||
frame.sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.heroConfig.Natural))
|
||||
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.heroConfig.Icon))
|
||||
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||
trainObj:SetActive(heroData.HeroTraining.trainingLv>0)
|
||||
trainLv.text="特训等级"..heroData.HeroTraining.trainingLv
|
||||
name.text=heroData.heroConfig.Name
|
||||
lv.text=heroData.lv
|
||||
SetHeroStars(self.spLoader,starGrid, heroData.star)
|
||||
Util.AddOnceClick(go,function ()
|
||||
end)
|
||||
local pos=buildData.dataSingle.Position
|
||||
local max=0
|
||||
local curValue=0
|
||||
local train=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",heroData.heroConfig.Id,"Level",heroData.HeroTraining.trainingLv)
|
||||
if train then
|
||||
local aaa=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",train.TrainSettingID,"Level",heroData.HeroTraining.trainingLv)
|
||||
if pos==1 then
|
||||
max=aaa.TrainExp1
|
||||
curValue=heroData.HeroTraining.attackExp
|
||||
elseif pos==2 then
|
||||
max=aaa.TrainExp2
|
||||
curValue=heroData.HeroTraining.defenseExp
|
||||
elseif pos==3 then
|
||||
max=aaa.TrainExp3
|
||||
curValue=heroData.HeroTraining.hpExp
|
||||
end
|
||||
end
|
||||
LogError("curvalue==========================="..curValue)
|
||||
local endTime=buildData.heroStarTime+math.ceil((max-curValue)/buildData.dataSingle.Gain)*60
|
||||
leftTime=endTime-GetTimeStamp()
|
||||
this:SetTime(name)
|
||||
else
|
||||
go:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
Util.AddLongPressClick(go,function ()
|
||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroId, 5)
|
||||
end,0.5)
|
||||
-- Util.AddLongPressClick(go,function ()
|
||||
-- UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroId, 5)
|
||||
-- end,0.5)
|
||||
end
|
||||
|
||||
function this:SetHeroList(isTop,isAni)
|
||||
local heroList = TrainBuildManager.GetAllCanTrainHero()
|
||||
local list={}
|
||||
--LogError("buildData.heroId======="..buildData.heroId)
|
||||
for k, v in pairs(heroList) do
|
||||
if CheckListIsContainValue1(TrainBuildManager.trainHeroId,v.dynamicId)==false or v.dynamicId==buildData.heroId then
|
||||
table.insert(list,v)
|
||||
end
|
||||
end
|
||||
self.noneObj:SetActive(#list==0)
|
||||
self.scrollView:SetData(list, function (index, item)
|
||||
this:ShowSingleHero(item, list[index],index)
|
||||
end,not isTop,not isAni)
|
||||
end
|
||||
|
||||
|
||||
function this:SetTime(_text)
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
_text.gameObject:SetActive(true)
|
||||
self.timer = Timer.New(function ()
|
||||
if leftTime >= 0 then
|
||||
_text.text = TimeToFelaxible(leftTime)
|
||||
leftTime = leftTime -1
|
||||
_text.gameObject:SetActive(true)
|
||||
if leftTime < 0 then
|
||||
--curObj.effect2:SetActive(true)
|
||||
_text.text="已完成"
|
||||
end
|
||||
else
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
_text.gameObject:SetActive(true)
|
||||
_text.text="已完成"
|
||||
end
|
||||
|
||||
end
|
||||
end, 1, -1, true)
|
||||
self.timer:Start()
|
||||
else
|
||||
_text.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
function this:ShowSingleHero(go,data,index)
|
||||
local heroData = data.heroConfig
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.Natural))
|
||||
|
@ -169,15 +233,20 @@ function this:ShowSingleHero(go,data,index)
|
|||
Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.ReadingName
|
||||
Util.GetGameObject(go, "choosed/Text"):GetComponent("Text").text="特训中"
|
||||
Util.GetGameObject(go, "lvBg/lv"):GetComponent("Text").text = data.lv
|
||||
local trainLv=Util.GetGameObject(go, "trainLvBg/Text"):GetComponent("Text")
|
||||
local trainObj=Util.GetGameObject(go, "trainLvBg")
|
||||
local choosed=Util.GetGameObject(go, "choosed")
|
||||
choosed:SetActive(curHeroId==data.dynamicId)
|
||||
local trainInfo=Util.GetGameObject(go, "trainLvBg")
|
||||
local trainLv=Util.GetGameObject(go, "trainLvBg/Text"):GetComponent("Text")
|
||||
trainObj:SetActive(data.HeroTraining.trainingLv>0)
|
||||
trainLv.text="特训等级"..data.HeroTraining.trainingLv
|
||||
local starGrid = Util.GetGameObject(go, "star")
|
||||
SetHeroStars(self.spLoader,starGrid,data.star)
|
||||
-- Util.AddLongPressClick(go,function ()
|
||||
-- UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, data.Reward[1], 5)
|
||||
-- end,0.5)
|
||||
--LogError("data.HeroTraining.attackExp=="..data.HeroTraining.attackExp.." heroData.HeroTraining.defenseExp=="..data.HeroTraining.defenseExp.." heroData.HeroTraining.hpExp=="..data.HeroTraining.hpExp)
|
||||
Util.AddOnceClick(go,function()
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
if data.dynamicId~=buildData.heroId then
|
||||
|
@ -210,6 +279,10 @@ function this:OnDestroy()
|
|||
self.wishListObj = {}
|
||||
self.tabListObj = {}
|
||||
self.spLoader:Destroy()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
end
|
||||
|
||||
return this
|
|
@ -731,6 +731,7 @@ function this.ExecuteLoading()
|
|||
--[[[58] =]]function() NetManager.RequestMagicSoldierInfo(LoadingPanel.OnStep) end, --神兵
|
||||
--[[[59] =]]function() NetManager.GemNewInfoRequest(LoadingPanel.OnStep) end, --新命石
|
||||
--[[[60] =]]function() NetManager.BaublesAllInfoRequest(LoadingPanel.OnStep) end, --新法宝
|
||||
--[[[61] =]]function() NetManager.TrainingArchitectureInfoRequest(LoadingPanel.OnStep) end, --特训信息
|
||||
function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||
-- 登录成功确认
|
||||
NetManager.LoginConfimRequest()
|
||||
|
|
|
@ -7588,6 +7588,7 @@ function NetManager.TrainingArchitectureInfoRequest(_func)
|
|||
local data = buffer:DataByte()
|
||||
local msg = HeroInfoProto_pb.TrainingArchitectureInfoResponse()
|
||||
msg:ParseFromString(data)
|
||||
CheckRedPointStatus(RedPointType.HomeLand)
|
||||
TrainBuildManager.GetServerData(msg)
|
||||
if _func then
|
||||
_func()
|
||||
|
@ -7609,10 +7610,11 @@ function NetManager.TrainingArchitectureUpRequest(_id,_type,_func)
|
|||
msg:ParseFromString(data)
|
||||
LogError("升级请求")
|
||||
TrainBuildManager.SetBuildInfo(msg.info)
|
||||
if _func then
|
||||
_func()
|
||||
end
|
||||
|
||||
NetManager.TrainingArchitectureInfoRequest(function()
|
||||
if _func then
|
||||
_func()
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end
|
||||
-- 开始/结束特训请求
|
||||
|
@ -7627,13 +7629,18 @@ function NetManager.TrainingRequest(_id,_heroId,_type,_func)
|
|||
local msg = HeroInfoProto_pb.TrainingResponse()
|
||||
msg:ParseFromString(data)
|
||||
LogError("特训请求")
|
||||
LogError("TrainBuildManager.trainHeroId len==="..#TrainBuildManager.trainHeroId)
|
||||
if _type==1 then
|
||||
table.insert(TrainBuildManager.trainHeroId,_heroId)
|
||||
PopupTipPanel.ShowTip("英雄开始特训")
|
||||
elseif _type==2 then
|
||||
table.remove(TrainBuildManager.trainHeroId,_heroId)
|
||||
LogError("remove heroid==============".._heroId)
|
||||
table.removebyvalue(TrainBuildManager.trainHeroId,_heroId)
|
||||
PopupTipPanel.ShowTip("英雄特训结束")
|
||||
LogError("TrainBuildManager.trainHeroId len==="..#TrainBuildManager.trainHeroId)
|
||||
end
|
||||
if msg.training then
|
||||
HeroManager.SetHeroTraining(msg.training)
|
||||
HeroManager.SetHeroTraining(_heroId,msg.training)
|
||||
end
|
||||
TrainBuildManager.SetBuildInfo(msg.info)
|
||||
if _func then
|
||||
|
|
|
@ -693,7 +693,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.chaozhifanli6,DynamicActivityManager.CheckRedPointPremiumSingle)
|
||||
RPData:AddCheckFunc(RedPointType.chaozhifanli30,DynamicActivityManager.CheckRedPointPremiumSingle)
|
||||
--家园
|
||||
RPData:AddCheckFunc(RedPointType.HomeLand,HomeLandManager.CheckRedMain,FUNCTION_OPEN_TYPE.HOMELAND)
|
||||
RPData:AddCheckFunc(RedPointType.HomeLand,TrainBuildManager.CheckRedMain,FUNCTION_OPEN_TYPE.HOMELAND)
|
||||
RPData:AddCheckFunc(RedPointType.FestevalRed,ActivityGiftManager.FestevalRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.EightLoginReward,ActivityGiftManager.CheckLoginRewardRedPoint)
|
||||
--超值基金
|
||||
|
|
Loading…
Reference in New Issue