Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
905d77b0c6
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f04db2c77d4bcba4a9df036f738b9c3b
|
||||
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: 65
|
||||
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: d2e9f29c997b2f94c9f758bd1d6536e9
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ActivityAltas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 287 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 496 KiB |
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d9a48539c989e264397969b5972336a7
|
||||
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: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 2d24e9cfb9f1b8b429a97564cee108a8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -4714,6 +4714,7 @@ RectTransform:
|
|||
- {fileID: 1813713664956134180}
|
||||
- {fileID: 823593164}
|
||||
- {fileID: 292092326}
|
||||
- {fileID: 3157915663087155780}
|
||||
m_Father: {fileID: 536587889}
|
||||
m_RootOrder: 19
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -79413,6 +79414,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3222777918422195293
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7863745430259052524}
|
||||
- component: {fileID: 7976824197906678567}
|
||||
- component: {fileID: 3395766642870434690}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7863745430259052524
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3222777918422195293}
|
||||
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: 478125063205378893}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.5}
|
||||
m_SizeDelta: {x: -20, y: -13}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7976824197906678567
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3222777918422195293}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3395766642870434690
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3222777918422195293}
|
||||
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &3231489555760439884
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -123864,6 +123944,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5295955504520368963
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2986894922783530859}
|
||||
- component: {fileID: 6069643305300658594}
|
||||
- component: {fileID: 3470181072240167781}
|
||||
m_Layer: 5
|
||||
m_Name: Placeholder
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2986894922783530859
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5295955504520368963}
|
||||
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: 478125063205378893}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.5}
|
||||
m_SizeDelta: {x: -20, y: -13}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6069643305300658594
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5295955504520368963}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3470181072240167781
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5295955504520368963}
|
||||
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: 0.5}
|
||||
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 2
|
||||
m_BestFit: 0
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &5362636454647996904
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -136814,6 +136973,147 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 2
|
||||
--- !u!1 &6737913756222566904
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 478125063205378893}
|
||||
- component: {fileID: 7225139684366710210}
|
||||
- component: {fileID: 2364922554732681452}
|
||||
- component: {fileID: 6841776979610783376}
|
||||
m_Layer: 5
|
||||
m_Name: input
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &478125063205378893
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6737913756222566904}
|
||||
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: 2986894922783530859}
|
||||
- {fileID: 7863745430259052524}
|
||||
m_Father: {fileID: 3157915663087155780}
|
||||
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: 229.9, y: 0}
|
||||
m_SizeDelta: {x: 288.5, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7225139684366710210
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6737913756222566904}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2364922554732681452
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6737913756222566904}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &6841776979610783376
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6737913756222566904}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 2364922554732681452}
|
||||
m_TextComponent: {fileID: 3395766642870434690}
|
||||
m_Placeholder: {fileID: 3470181072240167781}
|
||||
m_ContentType: 0
|
||||
m_InputType: 0
|
||||
m_AsteriskChar: 42
|
||||
m_KeyboardType: 0
|
||||
m_LineType: 0
|
||||
m_HideMobileInput: 0
|
||||
m_CharacterValidation: 0
|
||||
m_CharacterLimit: 0
|
||||
m_OnEndEdit:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_CustomCaretColor: 0
|
||||
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
|
||||
m_Text:
|
||||
m_CaretBlinkRate: 0.85
|
||||
m_CaretWidth: 1
|
||||
m_ReadOnly: 0
|
||||
--- !u!1 &6745011828034989455
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -141644,6 +141944,86 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6765047254972389261
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3157915663087155780}
|
||||
- component: {fileID: 4569805270029495793}
|
||||
- component: {fileID: 6263879605122327635}
|
||||
m_Layer: 5
|
||||
m_Name: star
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3157915663087155780
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6765047254972389261}
|
||||
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: 478125063205378893}
|
||||
m_Father: {fileID: 1583022895}
|
||||
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: -403.00003, y: 370}
|
||||
m_SizeDelta: {x: 160, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4569805270029495793
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6765047254972389261}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6263879605122327635
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6765047254972389261}
|
||||
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: 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_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u661F\u7EA7"
|
||||
--- !u!1 &6837351265622752912
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1014,6 +1014,7 @@ ActivityTypeDef = {
|
|||
TreasureOfHeaven=54,--天宫秘宝
|
||||
OpenSeverWelfare=55,--开服福利
|
||||
EightDayGift = 56,--八日登陆
|
||||
SignInfo = 57,--三日七日签到
|
||||
|
||||
}
|
||||
--活动结束需要处理面板关闭类型
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
[10025] = "是否点击============",
|
||||
[10026] = "开服福利",
|
||||
[10027] = "需先领取上一奖励!",
|
||||
[10028] = "重置时间:",
|
||||
[10028] = "剩余时间:",
|
||||
[10029] = "活动已结束!",
|
||||
[10030] = "排名",
|
||||
[10031] = "且战力达到",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,8 @@ function this:BindEvent()
|
|||
this.text:SetActive(false)
|
||||
this.cost:SetActive(false)
|
||||
|
||||
this.ShowCostInfo()
|
||||
|
||||
local value = this.RebuildData(msg.heroTempId,curSelectHero)
|
||||
this.SetHero(this.replaceHero,value)
|
||||
end)
|
||||
|
|
@ -80,6 +82,8 @@ function this:BindEvent()
|
|||
this.text:SetActive(false)
|
||||
this.cost:SetActive(true)
|
||||
|
||||
this.ShowCostInfo()
|
||||
|
||||
end)
|
||||
end)
|
||||
--保存置换
|
||||
|
|
@ -93,6 +97,8 @@ function this:BindEvent()
|
|||
this.text:SetActive(true)
|
||||
this.cost:SetActive(false)
|
||||
|
||||
this.ShowCostInfo()
|
||||
|
||||
HeroManager.DeleteHeroDatas({curSelectHero.dynamicId})
|
||||
|
||||
for i = 1, #msg.drop.Hero do
|
||||
|
|
@ -100,11 +106,13 @@ function this:BindEvent()
|
|||
end
|
||||
curSelectHero = HeroManager.GetSingleHeroData(msg.drop.Hero[1].id)
|
||||
this.ShowCurrPosHeroReplace(curIndex)
|
||||
for i = 1, #heroDatas do
|
||||
if heroSelectBtn[i] and heroDatas[i] then
|
||||
heroSelectBtn[i]:SetActive(heroDatas[i].dynamicId == curSelectHero.dynamicId)
|
||||
end
|
||||
end
|
||||
|
||||
-- for i = 1, #heroDatas do
|
||||
-- if heroSelectBtn[i] and heroDatas[i] then
|
||||
-- heroSelectBtn[i]:SetActive(heroDatas[i].dynamicId == curSelectHero.dynamicId)
|
||||
-- end
|
||||
-- end
|
||||
|
||||
end)
|
||||
end)
|
||||
|
||||
|
|
@ -168,7 +176,10 @@ function this.ShowCurrPosHeroReplace(_curIndex)
|
|||
this.needHero:SetActive(false)
|
||||
heroDatas = this.GetHeroDataByPosition(_curIndex)
|
||||
this.ScrollView:SetData(heroDatas, function (index, go)
|
||||
heroSelectBtn[index] = Util.GetGameObject(go.transform, "choosed")
|
||||
-- heroSelectBtn[index] = Util.GetGameObject(go.transform, "choosed")
|
||||
-- if not heroSelectBtn[heroDatas[index].dynamicId] then
|
||||
-- heroSelectBtn[heroDatas[index].dynamicId] = Util.GetGameObject(go.transform, "choosed")
|
||||
-- end
|
||||
this.SingleHeroDataShow(go, heroDatas[index])
|
||||
end)
|
||||
end
|
||||
|
|
@ -185,7 +196,7 @@ function this.GetHeroDataByPosition(_position)
|
|||
end
|
||||
return heros
|
||||
end
|
||||
|
||||
local oldChoose
|
||||
--数据显示
|
||||
function this.SingleHeroDataShow(_go,_heroData)
|
||||
local go = _go
|
||||
|
|
@ -215,7 +226,10 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
local cardBtn = Util.GetGameObject(go.transform, "icon")
|
||||
local choosed = Util.GetGameObject(go.transform, "choosed")
|
||||
choosed:SetActive(false)
|
||||
|
||||
if curSelectHero.dynamicId == heroData.dynamicId then
|
||||
choosed:SetActive(true)
|
||||
oldChoose = choosed
|
||||
end
|
||||
this.replaceBtn:SetActive(true)
|
||||
this.cancelBtn:SetActive(false)
|
||||
this.saveBtn:SetActive(false)
|
||||
|
|
@ -226,7 +240,6 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
|
||||
if curSelectHero.id then
|
||||
this.SetHero(this.needHero,curSelectHero)
|
||||
choosed:SetActive(true)
|
||||
this.ShowCostInfo()
|
||||
this.needHero:SetActive(true)
|
||||
this.replaceHero:SetActive(false)
|
||||
|
|
@ -239,6 +252,7 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
Util.AddOnceClick(cardBtn, function()
|
||||
if heroData.dynamicId == curSelectHero.dynamicId then
|
||||
choosed:SetActive(false)
|
||||
oldChoose = nil
|
||||
curSelectHero = {}
|
||||
|
||||
this.needHero:SetActive(false)
|
||||
|
|
@ -253,6 +267,10 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
|
||||
else
|
||||
choosed:SetActive(true)
|
||||
if oldChoose then
|
||||
oldChoose:SetActive(false)
|
||||
end
|
||||
oldChoose = choosed
|
||||
curSelectHero = heroData
|
||||
this.ShowCostInfo()
|
||||
this.needHero:SetActive(true)
|
||||
|
|
@ -291,11 +309,11 @@ function this.SingleHeroDataShow(_go,_heroData)
|
|||
end
|
||||
end
|
||||
|
||||
for i = 1, #heroDatas do
|
||||
if heroSelectBtn[i] and heroDatas[i] then
|
||||
heroSelectBtn[i]:SetActive(heroDatas[i].dynamicId == curSelectHero.dynamicId)
|
||||
end
|
||||
end
|
||||
-- for i = 1, #heroDatas do
|
||||
-- if heroSelectBtn[i] and heroDatas[i] then
|
||||
-- heroSelectBtn[i]:SetActive(heroDatas[i].dynamicId == curSelectHero.dynamicId)
|
||||
-- end
|
||||
-- end
|
||||
|
||||
end)
|
||||
|
||||
|
|
@ -411,9 +429,11 @@ function this:OnClose()
|
|||
curSelectHeroConfig = {}
|
||||
this.replaceHero:SetActive(false)
|
||||
this.needHero:SetActive(false)
|
||||
oldChoose = nil
|
||||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -12,11 +12,16 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
|||
[2] = { --乾坤宝盒
|
||||
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
|
||||
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
|
||||
},
|
||||
},
|
||||
[3] = { --珍奇礼包
|
||||
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
|
||||
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
|
||||
}
|
||||
}
|
||||
|
||||
local TimeLimitedCall = require("Modules/Operating/TimeLimitedCall")
|
||||
local QianKunBox = require("Modules/Operating/QianKunBox")
|
||||
|
||||
local ZhenQiYiBaoPage=require("Modules/Operating/ZhenQiYiBaoPage")
|
||||
--初始化组件(用于子类重写)
|
||||
function DynamicActivityPanel:InitComponent()
|
||||
orginLayer = 0
|
||||
|
|
@ -26,7 +31,8 @@ function DynamicActivityPanel:InitComponent()
|
|||
|
||||
this.PageList = {
|
||||
[1] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
|
||||
[2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2"))
|
||||
[2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
|
||||
[3] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
|
||||
}
|
||||
|
||||
-- 上部货币显示
|
||||
|
|
@ -99,8 +105,11 @@ end
|
|||
function this.OnPageTabChange(index, lastIndex)
|
||||
this._CurPageIndex = index
|
||||
for i = 1, #this.PageList do
|
||||
this.PageList[i]:OnHide()
|
||||
this.PageList[i].gameObject:SetActive(false)
|
||||
if this.PageList[i] then
|
||||
this.PageList[i]:OnHide()
|
||||
this.PageList[i].gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
end
|
||||
this.PageList[index]:OnShow(this.sortingOrder, _PageInfo[index].params and unpack(_PageInfo[index].params) or nil)
|
||||
this.PageList[index].gameObject:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -10,10 +10,22 @@ local CumulativeSignInPage = quick_class("CumulativeSignInPage")
|
|||
local kMaxDay = 31
|
||||
--已领取 再领一次
|
||||
local receiveImage={[1]="s_slbz_yilingqu",[2]="r_meiriqiandao_zailingyici"}
|
||||
local boxImage = {
|
||||
[1] = "r_renwu_box2",
|
||||
[2] = ""
|
||||
}
|
||||
--本地标记可领取次数
|
||||
local receiveNum=0
|
||||
--今日是否充值标记 1未充值 2已充值
|
||||
local rechargeNum=0
|
||||
local items={}
|
||||
local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SignInfo)
|
||||
local SignRewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActivityTypeDef.SignInfo)
|
||||
|
||||
local pos = {
|
||||
[1] = Vector3.New(-98,184,100),
|
||||
[2] = Vector3.New(188,184,100),
|
||||
}
|
||||
|
||||
|
||||
function CumulativeSignInPage:ctor(mainPanel, gameObject)
|
||||
|
|
@ -45,7 +57,74 @@ function CumulativeSignInPage:RefreshPanel()
|
|||
self:CreateSignList()
|
||||
end
|
||||
self:RefreshSignList()
|
||||
self:RefreshBox()
|
||||
end
|
||||
|
||||
function CumulativeSignInPage:RefreshBox()
|
||||
|
||||
local content = Util.GetGameObject(self.gameObject, "content")
|
||||
local text = Util.GetGameObject(self.gameObject, "content/day/Text"):GetComponent("Text")
|
||||
local progressBottom = Util.GetGameObject(content, "progressBottom/Image"):GetComponent("Image")
|
||||
local rewardPanel = Util.GetGameObject(self.gameObject, "content/RewardPanel")
|
||||
local maskBtn = Util.GetGameObject(self.gameObject, "content/RewardPanel/rewardMaskBtn")
|
||||
local itemview = Util.GetGameObject(self.gameObject, "content/RewardPanel/ViewRect/ItemView")
|
||||
|
||||
|
||||
local curDay = data.value
|
||||
progressBottom.fillAmount = curDay/7
|
||||
text.text = curDay.."天"
|
||||
rewardPanel:SetActive(false)
|
||||
|
||||
for i = 1, #data.mission do
|
||||
local btnBox = Util.GetGameObject(content,"progressBottom/BoxBtn"..i)
|
||||
local effectKeKaiQi = Util.GetGameObject(btnBox,"UI_Effect_BaoXiang_KeKaiQi")
|
||||
local effectKaiQi = Util.GetGameObject(btnBox,"UI_Effect_BaoXiang_KaiQi")
|
||||
local KaiQi = Util.GetGameObject(effectKaiQi,"KaiQi")
|
||||
|
||||
btnBox:GetComponent("Image").enabled = data.mission[i].state == 0
|
||||
effectKeKaiQi:SetActive((curDay>=SignRewardConfig[i].Values[1][1]) and (data.mission[i].state == 0))
|
||||
effectKaiQi:SetActive(data.mission[i].state == 1)
|
||||
KaiQi:SetActive(data.mission[i].state == 1)
|
||||
btnBox:GetComponent("Button").interactable = data.mission[i].state == 0
|
||||
if data.mission[i].state == 0 then--未领取
|
||||
if curDay<SignRewardConfig[i].Values[1][1] then
|
||||
--点击显示预览
|
||||
Util.AddOnceClick(btnBox,function()
|
||||
local getInfo Util.GetGameObject(rewardPanel,"getInfo"):GetComponent("Text").text = "连续签到"..SignRewardConfig[i].Values[1][1].."天获得:"
|
||||
for j = 1, #SignRewardConfig[i].Reward do
|
||||
if not items[j] then
|
||||
local view = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(rewardPanel, "ViewRect/grid").transform)
|
||||
items[j] = view
|
||||
view.gameObject:SetActive(false)
|
||||
end
|
||||
items[j]:OnOpen(false, {SignRewardConfig[i].Reward[j][1],SignRewardConfig[i].Reward[j][2]}, 0.8,false,false,false,self.sortingOrder)
|
||||
items[j].gameObject:SetActive(true)
|
||||
end
|
||||
rewardPanel:SetActive(true)
|
||||
rewardPanel:GetComponent("RectTransform").localPosition = pos[i]
|
||||
end)
|
||||
|
||||
elseif curDay>=SignRewardConfig[i].Values[1][1] then
|
||||
Util.AddOnceClick(btnBox,function()
|
||||
NetManager.GetActivityRewardRequest(data.mission[i].missionId, data.activityId, function(drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1)
|
||||
self:RefreshBox()
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
Util.AddOnceClick(maskBtn,function()
|
||||
for i = 1, #items do
|
||||
items[i].gameObject:SetActive(false)
|
||||
end
|
||||
rewardPanel:SetActive(false)
|
||||
end)
|
||||
end
|
||||
|
||||
function CumulativeSignInPage:OnSortingOrderChange(cursortingOrder)
|
||||
if self.signInRewardList then
|
||||
for i=1, #self.signInRewardList do
|
||||
|
|
@ -141,6 +220,7 @@ function CumulativeSignInPage:OnSignInClicked(Id, index)
|
|||
self.SignData.state = 1
|
||||
Util.GetGameObject(self.signInList[index], "redPoint"):SetActive(false)
|
||||
self:RefreshSignList()
|
||||
self:RefreshBox()
|
||||
end)
|
||||
elseif receiveNum==0 and rechargeNum==1 then
|
||||
MsgPanel.ShowTwo(Language[11446], function()
|
||||
|
|
@ -177,4 +257,8 @@ function CumulativeSignInPage:SetIcon(index,root)
|
|||
end
|
||||
end
|
||||
|
||||
function CumulativeSignInPage:OnDestroy()
|
||||
items={}
|
||||
end
|
||||
|
||||
return CumulativeSignInPage
|
||||
|
|
@ -154,13 +154,16 @@ end
|
|||
--- 获取商品已经购买次数
|
||||
function this.GetGoodsBuyTime(type, goodsId)
|
||||
if not giftGoodsInfoList[type] then
|
||||
return
|
||||
--王振兴添加 防止没有查询到数据报错
|
||||
return 0
|
||||
end
|
||||
for k,v in pairs(giftGoodsInfoList[type]) do
|
||||
if v.goodsId == goodsId then
|
||||
return v.buyTimes
|
||||
end
|
||||
end
|
||||
--王振兴添加 防止没有查询到数据报错
|
||||
return 0
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ function OperatingPanel:OnDestroy()
|
|||
ClearRedPointObject(RedPointType.MonthCard)
|
||||
|
||||
self.operatingContents[1]:OnDestroy()
|
||||
self.operatingContents[5]:OnDestroy()
|
||||
end
|
||||
|
||||
function OperatingPanel:OnTabClicked(index)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,170 @@
|
|||
local ZhenQiYiBaoPage = quick_class("ZhenQiYiBaoPage")
|
||||
local allData={}
|
||||
local itemsGrid = {}--item重复利用
|
||||
local this=ZhenQiYiBaoPage
|
||||
function ZhenQiYiBaoPage:ctor(mainPanel, gameObject)
|
||||
self.mainPanel = mainPanel
|
||||
self.gameObject = gameObject
|
||||
self:InitComponent(gameObject)
|
||||
self:BindEvent()
|
||||
end
|
||||
|
||||
function ZhenQiYiBaoPage:InitComponent(gameObject)
|
||||
|
||||
this.itemPre = Util.GetGameObject(gameObject, "ItemPre3")
|
||||
this.scrollItem = Util.GetGameObject(gameObject, "scrollItem")
|
||||
local rootHight = this.scrollItem.transform.rect.height
|
||||
local width = this.scrollItem.transform.rect.width
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform,
|
||||
this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 35))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 2
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function ZhenQiYiBaoPage:BindEvent()
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function ZhenQiYiBaoPage:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.RechargeSuccessFunc)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function ZhenQiYiBaoPage:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.RechargeSuccessFunc)
|
||||
end
|
||||
local sortingOrder = 0
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ZhenQiYiBaoPage:OnOpen()
|
||||
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function ZhenQiYiBaoPage:OnShow(_sortingOrder)
|
||||
sortingOrder = _sortingOrder
|
||||
this:OnShowData()
|
||||
end
|
||||
function ZhenQiYiBaoPage:OnShowData()
|
||||
allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 23, "Type", GoodsTypeDef.DirectPurchaseGift)
|
||||
if allData then
|
||||
this.SortData(allData)
|
||||
this.ScrollView:SetData(allData, function (index, go)
|
||||
this.SingleDataShow(go, allData[index])
|
||||
end)
|
||||
LogError(#allData)
|
||||
end
|
||||
|
||||
end
|
||||
function ZhenQiYiBaoPage:SortData()
|
||||
if allData==nil then
|
||||
return
|
||||
end
|
||||
table.sort(allData, function(a,b)
|
||||
local aboughtNum = a.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, a.Id) > 0 and 2 or 1
|
||||
local bboughtNum = b.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, b.Id) > 0 and 2 or 1
|
||||
if aboughtNum == bboughtNum then
|
||||
return a.Id < b.Id
|
||||
else
|
||||
return aboughtNum > bboughtNum
|
||||
end
|
||||
end)
|
||||
end
|
||||
--刷新每一条的显示数据
|
||||
function this.SingleDataShow(pre,value)
|
||||
if pre==nil or value==nil then
|
||||
return
|
||||
end
|
||||
--绑定组件
|
||||
local shopItemData = value
|
||||
local price = Util.GetGameObject(pre, "btnBuy/price"):GetComponent("Text")
|
||||
local buyInfo = Util.GetGameObject(pre, "buyInfo")
|
||||
local btnBuy = Util.GetGameObject(pre, "btnBuy")
|
||||
local grid = Util.GetGameObject(pre, "scrollView/grid")
|
||||
local shadow = Util.GetGameObject(pre, "shadow")
|
||||
--local goodData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.DirectPurchaseGift, value.Id)
|
||||
local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, value.Id) or 0
|
||||
local shows = shopItemData.RewardShow
|
||||
buyInfo:GetComponent("Text").text ="("..Language[10556].. boughtNum.."/".. shopItemData.Limit..Language[10054] ..")"
|
||||
if shopItemData.Limit - boughtNum > 0 then
|
||||
price.text = shopItemData.Price..Language[10538]
|
||||
btnBuy:GetComponent("Button").enabled = true
|
||||
Util.SetGray(btnBuy, false)
|
||||
else
|
||||
price.text = Language[10539]
|
||||
btnBuy:GetComponent("Button").enabled = false
|
||||
Util.SetGray(btnBuy, true)
|
||||
end
|
||||
--滚动条复用重设itemview
|
||||
if itemsGrid[pre] then
|
||||
for i = 1, 4 do
|
||||
itemsGrid[pre][i].gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #shows do
|
||||
if itemsGrid[pre][i] then
|
||||
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder)
|
||||
itemsGrid[pre][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
else
|
||||
itemsGrid[pre]={}
|
||||
for i = 1, 4 do
|
||||
itemsGrid[pre][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform)
|
||||
itemsGrid[pre][i].gameObject:SetActive(false)
|
||||
local obj= newObjToParent(shadow,itemsGrid[pre][i].transform)
|
||||
obj.transform:SetAsFirstSibling()
|
||||
obj.transform:DOAnchorPos(Vector3(0,-3,0),0)
|
||||
obj:GetComponent("RectTransform").transform.localScale=Vector3.one*1.1
|
||||
obj.gameObject:SetActive(true)
|
||||
end
|
||||
for i = 1, #shows do
|
||||
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder)
|
||||
itemsGrid[pre][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
--local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FINDTREASURE_GIFT, data.id, 1)
|
||||
Util.AddOnceClick(btnBuy, function()
|
||||
if shopItemData.Limit <= boughtNum then
|
||||
PopupTipPanel.ShowTip(Language[10540])
|
||||
else
|
||||
--直购商品
|
||||
if AppConst.isSDKLogin then
|
||||
PayManager.Pay({ Id = value.Id })
|
||||
else
|
||||
NetManager.RequestBuyGiftGoods(value.Id, function(msg)
|
||||
FirstRechargeManager.RefreshAccumRechargeValue(value.Id)
|
||||
-- OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.DirectPurchaseGift, data.goodsId) -- 改成后端推了
|
||||
this.OnShowData()
|
||||
end)
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ZhenQiYiBaoPage:OnOpen()
|
||||
|
||||
end
|
||||
|
||||
function this.RechargeSuccessFunc(id)
|
||||
FirstRechargeManager.RefreshAccumRechargeValue(id)
|
||||
--OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id)
|
||||
this.OnShowData()
|
||||
end
|
||||
|
||||
function ZhenQiYiBaoPage:OnClose()
|
||||
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function ZhenQiYiBaoPage:OnDestroy()
|
||||
|
||||
sortingOrder = 0
|
||||
end
|
||||
|
||||
function ZhenQiYiBaoPage:OnHide()
|
||||
|
||||
sortingOrder = 0
|
||||
end
|
||||
|
||||
return ZhenQiYiBaoPage
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0730fd842af9c9842b623978ef76f3ad
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
10025,是否点击============
|
||||
10026,开服福利
|
||||
10027,需先领取上一奖励!
|
||||
10028,重置时间:
|
||||
10028,剩余时间:
|
||||
10029,活动已结束!
|
||||
10030,排名
|
||||
10031,且战力达到
|
||||
|
|
|
|||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue