礼物功能提交

dev_one_discount
wangzhenxing 2023-09-13 14:57:48 +08:00
parent b2e7822bf1
commit eeb3859f72
36 changed files with 97096 additions and 7927 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -5235,7 +5235,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -15861,8 +15861,18 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_RootOrder
value: 14
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_LocalPosition.z
value: 265.00043
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
@ -15881,8 +15891,28 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_LocalPosition.z
value: 265.00043
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
@ -15894,6 +15924,46 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 67
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8904198713981393338, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bd194af093bc5564ba7ae00a6f664c2d, type: 3}
--- !u!224 &2235005027045194670 stripped

File diff suppressed because it is too large Load Diff

View File

@ -4922,7 +4922,7 @@ RectTransform:
m_Children:
- {fileID: 788618541235343804}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -38139,7 +38139,7 @@ RectTransform:
m_Children:
- {fileID: 4702999404591861702}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -38277,7 +38277,7 @@ RectTransform:
m_Children:
- {fileID: 8497496980748765707}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -38687,6 +38687,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3740841448225385249}
- {fileID: 7014157880640309384}
- {fileID: 8834495025878721902}
- {fileID: 2104297696566059952}
@ -58930,7 +58931,7 @@ RectTransform:
- {fileID: 7029056200395171643}
- {fileID: 8687714314605843872}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -59026,6 +59027,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7592260152405340942
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6916203219844342118}
- component: {fileID: 5864325615017586034}
- component: {fileID: 1114469541799281597}
m_Layer: 0
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6916203219844342118
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7592260152405340942}
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: 3740841448225385249}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -20, y: -20}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5864325615017586034
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7592260152405340942}
m_CullTransparentMesh: 0
--- !u!114 &1114469541799281597
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7592260152405340942}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &7649195202929452248
GameObject:
m_ObjectHideFlags: 0
@ -64057,6 +64132,144 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: 9999
LanguageIndex: 0
--- !u!1 &7768305452969337083
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3740841448225385249}
- component: {fileID: 3304734437331651406}
- component: {fileID: 4914637771728398215}
- component: {fileID: 8985288691158311318}
- component: {fileID: 498040121338188063}
m_Layer: 5
m_Name: giftBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3740841448225385249
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7768305452969337083}
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: 6916203219844342118}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 129, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3304734437331651406
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7768305452969337083}
m_CullTransparentMesh: 0
--- !u!114 &4914637771728398215
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7768305452969337083}
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: 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!114 &8985288691158311318
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7768305452969337083}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, 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: 3
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: 4914637771728398215}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &498040121338188063
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7768305452969337083}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7825964138541395834
GameObject:
m_ObjectHideFlags: 0
@ -70168,7 +70381,7 @@ RectTransform:
- {fileID: 2515134631909214660}
- {fileID: 4945657128760505677}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3c6aea9599a43d24580ec15c95b2a1b9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 08b7667dd9ee3de47b56eb3afc0c5463
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5519,7 +5519,7 @@ RectTransform:
m_Children:
- {fileID: 152083775259277987}
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -54963,7 +54963,7 @@ RectTransform:
- {fileID: 8984709730233134616}
- {fileID: 7499849661347554438}
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -55336,6 +55336,154 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1141418202338560068
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2366261149132539772}
- component: {fileID: 5851797801288281426}
- component: {fileID: 1071771753565119931}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2366261149132539772
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141418202338560068}
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: 490384716799589660}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 149.87, y: 149.82}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5851797801288281426
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141418202338560068}
m_CullTransparentMesh: 0
--- !u!114 &1071771753565119931
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141418202338560068}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 96ef5aeb52451da4a8b1240073551192, 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 &1141649868710637801
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4876358525613264104}
- component: {fileID: 352341804840592460}
- component: {fileID: 1474719342121097223}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4876358525613264104
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141649868710637801}
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: 490384716799589660}
m_RootOrder: 3
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: 49, y: 57.99997}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &352341804840592460
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141649868710637801}
m_CullTransparentMesh: 0
--- !u!114 &1474719342121097223
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141649868710637801}
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &1390469770212117568
GameObject:
m_ObjectHideFlags: 0
@ -57099,6 +57247,81 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4618086576988226055
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3984177795073103143}
- component: {fileID: 62393188477100640}
- component: {fileID: 6456173873644106775}
m_Layer: 5
m_Name: lock
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3984177795073103143
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4618086576988226055}
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: 7329325738939492352}
m_Father: {fileID: 490384716799589660}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6, y: -4}
m_SizeDelta: {x: 123, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &62393188477100640
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4618086576988226055}
m_CullTransparentMesh: 0
--- !u!114 &6456173873644106775
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4618086576988226055}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 6855519ff9d6ad742bd124d6932043ac, 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 &4687893014962182443
GameObject:
m_ObjectHideFlags: 0
@ -57392,6 +57615,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &4925192868848611509
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3835669011626558853}
- component: {fileID: 6614912843426619515}
- component: {fileID: 7030039185558324093}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3835669011626558853
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4925192868848611509}
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: 490384716799589660}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6614912843426619515
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4925192868848611509}
m_CullTransparentMesh: 0
--- !u!114 &7030039185558324093
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4925192868848611509}
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: 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 &5189905295769671105
GameObject:
m_ObjectHideFlags: 0
@ -58624,6 +58921,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7481869442294454757
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7329325738939492352}
- component: {fileID: 1733300461614287299}
- component: {fileID: 5555644554217124162}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7329325738939492352
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7481869442294454757}
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: 3984177795073103143}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1733300461614287299
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7481869442294454757}
m_CullTransparentMesh: 0
--- !u!114 &5555644554217124162
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7481869442294454757}
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: 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: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 23
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u4E03\u661F\u89E3\u9501"
LanguageIndex: 11548
--- !u!1 &7551254637041198217
GameObject:
m_ObjectHideFlags: 0
@ -59291,6 +59668,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1467830102957527101}
- {fileID: 490384716799589660}
- {fileID: 2246648241802263488}
- {fileID: 224987734323317496}
- {fileID: 1321918583775151979}
@ -59760,7 +60138,7 @@ RectTransform:
- {fileID: 5730679569691257838}
- {fileID: 539173715555894674}
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -59973,6 +60351,147 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &9015394733881745022
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 490384716799589660}
- component: {fileID: 6159701963710832051}
- component: {fileID: 1939228503604604432}
- component: {fileID: 2854097308420502564}
- component: {fileID: 595108572428645793}
m_Layer: 5
m_Name: giftBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &490384716799589660
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9015394733881745022}
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: 2366261149132539772}
- {fileID: 3835669011626558853}
- {fileID: 3984177795073103143}
- {fileID: 4876358525613264104}
m_Father: {fileID: 8221946263362407270}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 151, y: 151}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6159701963710832051
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9015394733881745022}
m_CullTransparentMesh: 0
--- !u!114 &1939228503604604432
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9015394733881745022}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, 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: 3
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: 595108572428645793}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &2854097308420502564
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9015394733881745022}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &595108572428645793
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9015394733881745022}
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: 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 &9086748526179909697
GameObject:
m_ObjectHideFlags: 0

View File

@ -2653,6 +2653,8 @@ ItemBaseType = {
TurnsCard=11,--变身卡
Talisman = 12, --法宝
FaXiang = 13, --法相
PlayerGift=14, --神将礼物
HeroGift=15, --英雄礼物
}
--探宝类型
TreasureType={

View File

@ -225,6 +225,7 @@ local ManagerNames = {
--命格
"Gem/GemManager",
"Gem/GemNewManager",
"Gem/GiftManager",
--数字游戏管理
"RatioNumber/RatioNumberLevelManager",
"RatioNumber/RatioNumberManager",

View File

@ -1378,6 +1378,10 @@ function GetEquipPosStrByEquipPosNum(_index)
return "魂印"
elseif _index == 6 then
return Language[12044]
elseif _index == 7 then
return "主角礼物"
elseif _index == 8 then
return "神将礼物"
end
end

View File

@ -291,6 +291,7 @@ ConfigName = {
ChangingCardPosition="ChangingCardPosition",
GemConfigNew ="GemConfigNew",
GemLotteryConfig="GemLotteryConfig",
GiftConfig="GiftConfig"
}
require "Framework/GameDataBase"

View File

@ -501,6 +501,8 @@ UIName = {
WishGemBuyTenPanel = 509, --命格十连
GemRewardInfoPanel = 510, --命格宝箱奖励
GemBoxLvUpPopup=511, --命石宝箱升级提示
RoleGiftPanel=512, --英雄礼包界面
PlayerGiftPanel=513, --主角礼包界面
}
SubUIConfig = {

View File

@ -89,6 +89,7 @@ HERO_GODSEALS_FIELD = protobuf.FieldDescriptor();
HERO_EQUIPSTRONG_FIELD = protobuf.FieldDescriptor();
HERO_EQUIPADVANCELV_FIELD = protobuf.FieldDescriptor();
HERO_FAXIANG_FIELD = protobuf.FieldDescriptor();
HERO_GIFTEQUIPIDS_FIELD = protobuf.FieldDescriptor();
POKEMONINFO = protobuf.Descriptor();
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
@ -538,6 +539,7 @@ TEAMONETEAMINFO_LIFEGRIDINFO_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_USERMOUNTINFO_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_GEMNEWS_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO = protobuf.Descriptor();
TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
@ -1753,11 +1755,21 @@ HERO_FAXIANG_FIELD.default_value = {}
HERO_FAXIANG_FIELD.type = 9
HERO_FAXIANG_FIELD.cpp_type = 9
HERO_GIFTEQUIPIDS_FIELD.name = "giftEquipIds"
HERO_GIFTEQUIPIDS_FIELD.full_name = ".rpc.protocols.Hero.giftEquipIds"
HERO_GIFTEQUIPIDS_FIELD.number = 24
HERO_GIFTEQUIPIDS_FIELD.index = 22
HERO_GIFTEQUIPIDS_FIELD.label = 3
HERO_GIFTEQUIPIDS_FIELD.has_default_value = false
HERO_GIFTEQUIPIDS_FIELD.default_value = {}
HERO_GIFTEQUIPIDS_FIELD.type = 5
HERO_GIFTEQUIPIDS_FIELD.cpp_type = 1
HERO.name = "Hero"
HERO.full_name = ".rpc.protocols.Hero"
HERO.nested_types = {}
HERO.enum_types = {}
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD, HERO_GODSOULLIST_FIELD, HERO_GODSOULLV_FIELD, HERO_PROPERTYID_FIELD, HERO_GODSEALS_FIELD, HERO_EQUIPSTRONG_FIELD, HERO_EQUIPADVANCELV_FIELD, HERO_FAXIANG_FIELD}
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD, HERO_GODSOULLIST_FIELD, HERO_GODSOULLV_FIELD, HERO_PROPERTYID_FIELD, HERO_GODSEALS_FIELD, HERO_EQUIPSTRONG_FIELD, HERO_EQUIPADVANCELV_FIELD, HERO_FAXIANG_FIELD, HERO_GIFTEQUIPIDS_FIELD}
HERO.is_extendable = false
HERO.extensions = {}
POKEMONINFO_TEMPID_FIELD.name = "tempId"
@ -6048,11 +6060,21 @@ TEAMONETEAMINFO_GEMNEWS_FIELD.message_type = GEMNEW
TEAMONETEAMINFO_GEMNEWS_FIELD.type = 11
TEAMONETEAMINFO_GEMNEWS_FIELD.cpp_type = 10
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.name = "giftEquipIds"
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.giftEquipIds"
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.number = 12
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.index = 11
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.label = 3
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.has_default_value = false
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.default_value = {}
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.type = 5
TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD.cpp_type = 1
TEAMONETEAMINFO.name = "TeamOneTeamInfo"
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
TEAMONETEAMINFO.nested_types = {}
TEAMONETEAMINFO.enum_types = {}
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD, TEAMONETEAMINFO_GEMNEWS_FIELD}
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD, TEAMONETEAMINFO_GEMNEWS_FIELD, TEAMONETEAMINFO_GIFTEQUIPIDS_FIELD}
TEAMONETEAMINFO.is_extendable = false
TEAMONETEAMINFO.extensions = {}
TEAMONEINFO_UID_FIELD.name = "uid"

View File

@ -334,6 +334,10 @@ HEROCHANGEREQUEST_HEROID2_FIELD = protobuf.FieldDescriptor();
HEROCHANGEREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
HEROCHANGERESPONSE = protobuf.Descriptor();
HEROCHANGERESPONSE_HEROS_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPWEARREQUEST = protobuf.Descriptor();
GIFTEQUIPWEARREQUEST_OPERATE_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPWEARREQUEST_ROLE_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD = protobuf.FieldDescriptor();
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
@ -3336,6 +3340,43 @@ HEROCHANGERESPONSE.enum_types = {}
HEROCHANGERESPONSE.fields = {HEROCHANGERESPONSE_HEROS_FIELD}
HEROCHANGERESPONSE.is_extendable = false
HEROCHANGERESPONSE.extensions = {}
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.name = "operate"
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.full_name = ".rpc.protocols.GiftEquipWearRequest.operate"
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.number = 1
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.index = 0
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.label = 1
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.has_default_value = false
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.default_value = 0
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.type = 5
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.cpp_type = 1
GIFTEQUIPWEARREQUEST_ROLE_FIELD.name = "role"
GIFTEQUIPWEARREQUEST_ROLE_FIELD.full_name = ".rpc.protocols.GiftEquipWearRequest.role"
GIFTEQUIPWEARREQUEST_ROLE_FIELD.number = 2
GIFTEQUIPWEARREQUEST_ROLE_FIELD.index = 1
GIFTEQUIPWEARREQUEST_ROLE_FIELD.label = 1
GIFTEQUIPWEARREQUEST_ROLE_FIELD.has_default_value = false
GIFTEQUIPWEARREQUEST_ROLE_FIELD.default_value = ""
GIFTEQUIPWEARREQUEST_ROLE_FIELD.type = 9
GIFTEQUIPWEARREQUEST_ROLE_FIELD.cpp_type = 9
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.name = "giftIds"
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.full_name = ".rpc.protocols.GiftEquipWearRequest.giftIds"
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.number = 3
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.index = 2
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.label = 3
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.has_default_value = false
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.default_value = {}
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.type = 5
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.cpp_type = 1
GIFTEQUIPWEARREQUEST.name = "GiftEquipWearRequest"
GIFTEQUIPWEARREQUEST.full_name = ".rpc.protocols.GiftEquipWearRequest"
GIFTEQUIPWEARREQUEST.nested_types = {}
GIFTEQUIPWEARREQUEST.enum_types = {}
GIFTEQUIPWEARREQUEST.fields = {GIFTEQUIPWEARREQUEST_OPERATE_FIELD, GIFTEQUIPWEARREQUEST_ROLE_FIELD, GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD}
GIFTEQUIPWEARREQUEST.is_extendable = false
GIFTEQUIPWEARREQUEST.extensions = {}
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
@ -3378,6 +3419,7 @@ GetLikableDataResponse = protobuf.Message(GETLIKABLEDATARESPONSE)
GetSkinIndication = protobuf.Message(GETSKININDICATION)
GetTransformationRequest = protobuf.Message(GETTRANSFORMATIONREQUEST)
GetTransformationResponse = protobuf.Message(GETTRANSFORMATIONRESPONSE)
GiftEquipWearRequest = protobuf.Message(GIFTEQUIPWEARREQUEST)
GodDevilHeroSelectPropRequest = protobuf.Message(GODDEVILHEROSELECTPROPREQUEST)
HeroChangeRequest = protobuf.Message(HEROCHANGEREQUEST)
HeroChangeResponse = protobuf.Message(HEROCHANGERESPONSE)

File diff suppressed because one or more lines are too long

View File

@ -79,6 +79,7 @@ GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_GIFTIDS_FIELD = protobuf.FieldDescriptor();
GETITEMINFOREQUEST = protobuf.Descriptor();
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
GETITEMINFORESPONSE = protobuf.Descriptor();
@ -1560,11 +1561,21 @@ GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.message_type = CommonProto_pb.LIFEGRID
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.type = 11
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD.cpp_type = 10
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.name = "giftIds"
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.giftIds"
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.number = 52
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.index = 50
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.label = 3
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.has_default_value = false
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.default_value = {}
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.type = 5
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.cpp_type = 1
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.nested_types = {}
GETPLAYERINFORESPONSE.enum_types = {}
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD, GETPLAYERINFORESPONSE_DRAWTIMES_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD, GETPLAYERINFORESPONSE_SIXIANGINFOS_FIELD, GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD, GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD, GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD, GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD, GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD}
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD, GETPLAYERINFORESPONSE_DRAWTIMES_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD, GETPLAYERINFORESPONSE_SIXIANGINFOS_FIELD, GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD, GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD, GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD, GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD, GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD, GETPLAYERINFORESPONSE_GIFTIDS_FIELD}
GETPLAYERINFORESPONSE.is_extendable = false
GETPLAYERINFORESPONSE.extensions = {}
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"

View File

@ -0,0 +1,104 @@
--新的命格管理
GiftManager = {}
local this = GiftManager
local giftConfig=ConfigManager.GetConfig(ConfigName.GiftConfig)
local equipConfig=ConfigManager.GetConfig(ConfigName.EquipConfig)
function this.Initialize()
this.allHeroGifts={}
this.playerGifts={}
end
--初始化命石
function this.InitGemsInfo(msg)
end
--初始化英雄礼物
function this.InitHeroGift(id,list)
this.allHeroGifts[id]=list
end
--初始化主角礼物
function this.InitPlayerGift(list)
this.playerGifts=list
end
--获取收取等级和最大数量
function this.GetCollectLvAndNum()
local lv=0
local maxNum=0
local collect=0
local curNum=0
for i=1,#this.playerGifts do
local id=this.playerGifts[i]
if equipConfig[id] then
collect=collect+equipConfig[id].Gift
end
end
for k, v in ConfigPairs(giftConfig) do
if collect>=v.Gift then
lv=v.Id
curNum=v.Box
else
maxNum=v.Box
break
end
end
return lv,curNum,maxNum
end
--设置英雄礼物 type 1穿 2
function this.SetHeroGift(id,list,type)
if this.allHeroGifts[id]==nil then
this.allHeroGifts[id]={}
end
for i=1,#list do
if type==1 then
table.insert(this.allHeroGifts[id],list[i])
elseif type==2 then
table.removebyvalue(this.allHeroGifts[id],list[i])
end
end
end
--设置主角礼物
function this.SetPlayerGift(list)
for i=1,#list do
table.insert(this.playerGifts,list[i])
end
end
function this.GetHeroGifts(_id)
if this.allHeroGifts[_id] then
return this.allHeroGifts[_id]
end
return {}
end
function this.GetPlayerGifts()
return this.playerGifts
end
function this.changeGiftsByType(_type,_list)
end
function this.CheckGemRed()
return false
end
function this.CheckSuperGemRed()
return false
end
return this

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3a256485d70a58e4cb3d1ab62c98abe1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -460,6 +460,8 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill)
heroData.talismanList = _msgHeroData.especialEquipLevel
heroData.jewels = _msgHeroData.jewels
heroData.faxiang = _msgHeroData.faxiang
heroData.giftIds=_msgHeroData.giftEquipIds
---↓↓↓↓↓↓↓↓↓↓↓摘星阁
heroData.equipStrong={}
for i = 1, #_msgHeroData.equipStrong do

View File

@ -144,6 +144,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
--LogError("_msgHeroData.soulPos=="..#_msgHeroData.soulPos)
heroData.soulPrintList = this.SetSoulPrint(_msgHeroData.soulPos,heroData.dynamicId)
heroData.godPrintList = this.SetGodPrint(_msgHeroData.godSeals,heroData.dynamicId)
GiftManager.InitHeroGift(_msgHeroData.id,_msgHeroData.giftEquipIds)
--heroData.equipStrongList=this.GetEquipStrongData(_msgHeroData.equipStrong,_msgHeroData.equipAdvanceLv)
--heroData.equipAdvanceLv =_msgHeroData.equipAdvanceLv
heroData.skillIdList = {}

View File

@ -244,7 +244,7 @@ function this.PlayerInfoRequest(func)
--GemManager.GetWearedGem(msg.lifeGridInfos)
--数字游戏初始化
RatioNumberLevelManager.ChapterHandle()
GiftManager.InitPlayerGift(msg.giftIds)
if func then
func(msg)
end
@ -7320,6 +7320,22 @@ function NetManager.GemNewInfoRequest(func)
end
function NetManager.GiftEquipWearRequest(_type,_roleId,_ids,_func)
local data = HeroInfoProto_pb.GiftEquipWearRequest()
data.operate=_type
data.role=_roleId
for i=1,#_ids do
table.insert(data.giftIds,_ids[i])
end
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.GiftEquipWearRequest,MessageTypeProto_pb.GiftEquipWearResponse,msg,function(buffer)
--msg:ParseFromString(data)
LogError("------------------------")
if _func then
_func()
end
end)
end

View File

@ -129,6 +129,7 @@ local InfoBtns = {
this.RideInfoShow(data,obj)
end
},
}
local curPlayerName = ""
@ -176,7 +177,7 @@ function PlayerInfoPopup:InitComponent()
end
this.newGems={}
for i=1,16 do
table.insert(this.newGems, Util.GetGameObject(self.gameObject, "tipImage/panel/newGemInfo/Demons/heroPro (" .. i .. ")"))
table.insert(this.newGems, Util.GetGameObject(self.gameObject, "tipImage/panel/InfoGrids/Bg/GemInfo/Grid/heroPro (" .. i .. ")"))
end
this.pokemonObj=Util.GetGameObject(self.transform, "tipImage/panel/pokemonInfo").gameObject
this.weaponInfo=Util.GetGameObject(self.transform, "tipImage/panel/weaponInfo")
@ -510,28 +511,7 @@ function this.FormationAdapter(teamInfo)
end)
end
end
--队伍命石信息
local gems=teamInfo.gemNews
if gems and #gems>0 then
this.newGemInfo:SetActive(true)
for i=1,16 do
if gems[i] then
this.newGems[i]:SetActive(true)
local data=GemNewManager.ChangeOneGemData(gems[i])
Util.GetGameObject(this.newGems[i], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(data.frame)
Util.GetGameObject(this.newGems[i], "hero/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(data.icon)
local frameBtn = Util.GetGameObject(this.newGems[i], "frame")
local heroData = {}
Util.AddOnceClick(frameBtn, function()
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup,data,3)
end)
else
this.newGems[i]:SetActive(false)
end
end
else
this.newGemInfo:SetActive(false)
end
--====================其他信息按钮显示======================
this.infoIndex = 0
for index, value in ipairs(InfoBtns) do
@ -554,15 +534,15 @@ function this.FormationAdapter(teamInfo)
if this.infoIndex == 0 then
this.infoIndex = index
end
elseif (index == 4 and teamInfo.lifeGridInfo and #teamInfo.lifeGridInfo > 0) then--命石
local num = 0
for i = 1, #teamInfo.lifeGridInfo do
local data = teamInfo.lifeGridInfo[i]
if data.itemId and data.itemId > 0 then
num = num + 1
end
end
item.gameObject:SetActive(num > 0)
elseif (index == 4 and teamInfo.gemNews and #teamInfo.gemNews > 0) then--命石
-- local num = 0
-- for i = 1, #teamInfo.gemNews do
-- local data = teamInfo.gemNews[i]
-- if data.itemId and data.itemId > 0 then
-- num = num + 1
-- end
-- end
item.gameObject:SetActive(#teamInfo.gemNews> 0)
if this.infoIndex == 0 then
this.infoIndex = index
end
@ -688,26 +668,49 @@ end
--命格
function this.GemInfoShow(teamInfo,Grid)
local iconList = {}
local levelList = {}
for i = 1, 8 do
iconList[i] = {}
levelList[i] = {}
for j = 1, 3 do
iconList[i][j] = Util.GetGameObject(Grid,"item ("..i..")/stone ("..j..")/icon")
levelList[i][j] = Util.GetGameObject(Grid,"item ("..i..")/stone ("..j..")/Text")
iconList[i][j]:SetActive(false)
levelList[i][j]:GetComponent("Text").text = ""
end
end
for i = 1, #teamInfo.lifeGridInfo do
local data = teamInfo.lifeGridInfo[i]
-- LogBlue("命格 id"..tostring(data.gridId).." 位置:"..tostring(data.gridIndex).." 命石Id"..tostring(data.itemId))
if data.itemId and data.itemId > 0 then
iconList[data.gridId][data.gridIndex]:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(data.itemId))
levelList[data.gridId][data.gridIndex]:GetComponent("Text").text = GemConfig[data.itemId].Level
iconList[data.gridId][data.gridIndex]:SetActive(true)
end
-- local iconList = {}
-- local levelList = {}
-- for i = 1, 8 do
-- iconList[i] = {}
-- levelList[i] = {}
-- for j = 1, 3 do
-- iconList[i][j] = Util.GetGameObject(Grid,"item ("..i..")/stone ("..j..")/icon")
-- levelList[i][j] = Util.GetGameObject(Grid,"item ("..i..")/stone ("..j..")/Text")
-- iconList[i][j]:SetActive(false)
-- levelList[i][j]:GetComponent("Text").text = ""
-- end
-- end
-- for i = 1, #teamInfo.lifeGridInfo do
-- local data = teamInfo.lifeGridInfo[i]
-- -- LogBlue("命格 id"..tostring(data.gridId).." 位置:"..tostring(data.gridIndex).." 命石Id"..tostring(data.itemId))
-- if data.itemId and data.itemId > 0 then
-- iconList[data.gridId][data.gridIndex]:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(data.itemId))
-- levelList[data.gridId][data.gridIndex]:GetComponent("Text").text = GemConfig[data.itemId].Level
-- iconList[data.gridId][data.gridIndex]:SetActive(true)
-- end
-- end
--队伍命石信息
local gems=teamInfo.gemNews
if gems and #gems>0 then
this.newGemInfo:SetActive(false)
for i=1,16 do
if gems[i] then
this.newGems[i]:SetActive(true)
local data=GemNewManager.ChangeOneGemData(gems[i])
Util.GetGameObject(this.newGems[i], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(data.frame)
Util.GetGameObject(this.newGems[i], "hero/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(data.icon)
local frameBtn = Util.GetGameObject(this.newGems[i], "frame")
local heroData = {}
Util.AddOnceClick(frameBtn, function()
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup,data,3)
end)
else
this.newGems[i]:SetActive(false)
end
end
else
this.newGemInfo:SetActive(false)
end
end

View File

@ -10,6 +10,7 @@ local _BaseProList = {}--基础属性对象
local _homeProList = {}--摘星阁属性对象
local _suitProList = {}--套装属性对象
local _superProList = {}--白金属性对象
local equipConfigData
local typeToUpdate = {
[2] = 2,--已穿戴->卸载单件
[3] = 1,--未穿戴->穿单件
@ -126,10 +127,32 @@ function RewardEquipSingleShowPopup2:BindEvent()
local equipDataList={}
table.insert(equipIdList,tostring(self.equipData.id))
table.insert(equipDataList,self.equipData)
NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList,1,function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,0,self.position)
end)
if equipConfigData.Position==7 or equipConfigData.Position==8 then
local idList={}
table.insert(idList,self.equipData.id)
local heroId=""
if self.curHeroData then
heroId=self.curHeroData.dynamicId
else
heroId="0"
end
NetManager.GiftEquipWearRequest(1,heroId,idList,function()
self:ClosePanel()
if heroId=="0" then
GiftManager.SetPlayerGift(idList)
else
GiftManager.SetHeroGift(self.curHeroData.dynamicId,idList,1)
end
self.parent.RefreshWindowData()
end)
else
NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList,1,function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,0,self.position)
end)
end
end)
--卸下
Util.AddClick(self.btnDown, function()
@ -137,10 +160,24 @@ function RewardEquipSingleShowPopup2:BindEvent()
local equipDataList={}
table.insert(equipIdList,tostring(self.equipData.id))
table.insert(equipDataList,self.equipData)
NetManager.EquipUnLoadOptRequest(self.curHeroData.dynamicId,equipIdList ,1, function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList)
end)
if equipConfigData.Position==7 or equipConfigData.Position==8 then
local idList={}
LogError("2222222222222222222222"..self.curHeroData.dynamicId)
LogError("self.equipData.id==="..self.equipData.id)
table.insert(idList,self.equipData.id)
--table.insert(idList,5200020)
NetManager.GiftEquipWearRequest(2,self.curHeroData.dynamicId,idList,function()
self:ClosePanel()
GiftManager.SetHeroGift(self.curHeroData.dynamicId,idList,2)
self.parent.RefreshWindowData()
end)
else
NetManager.EquipUnLoadOptRequest(self.curHeroData.dynamicId,equipIdList ,1, function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList)
end)
end
end)
--替换
@ -239,7 +276,7 @@ function RewardEquipSingleShowPopup2:OnShow()
--上部装备基础信息
Log("装备id:"..tostring(self.equipData.id).." openType:"..tostring(self.openType))
self:SetBtns()
local equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(self.equipData.id))
equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(self.equipData.id))
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id))
local aaa=equipConfigData.Quality
if equipConfigData.Quality==8 then

View File

@ -7,6 +7,7 @@ local triggerCallBack
local allSkillDatas = {}
local soulPrintPreList={}--魂印预设容器
local godPrintPreList={}--魂印预设容器
local giftList={} --礼物预设容器
local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local heroRankupConfig=ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
@ -88,7 +89,10 @@ function RoleInfoPopup:InitComponent()
this.godPrintInfo = Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content/GodPrintInfo")
this.godPrintGrid = Util.GetGameObject(this.godPrintInfo, "Grid")
this.godPrintPre=Util.GetGameObject(this.godPrintGrid,"SoulPrintPre")
--礼物
this.giftInfo=Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content/giftInfo")
this.giftGrid = Util.GetGameObject(this.giftInfo, "Grid")
this.giftPre=Util.GetGameObject(this.giftGrid,"giftPre")
--技能
this.skillInfo = Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content/skillInfo")
this.skillGrid = Util.GetGameObject(this.skillInfo, "Grid")
@ -230,6 +234,7 @@ function RoleInfoPopup:OnShow()
this.RoleInfo1()
this.EquipInfo()
this.SoulPrintInfo()
this.GiftInfo()
this.GodPrintInfo()
this.SkillInfo()
end
@ -249,6 +254,7 @@ function RoleInfoPopup:OnDestroy()
soulPrintPreList={}
this.pinjieList={}
godPrintPreList={}
giftList={}
orginLayer2=0
this.shenhunList = {}
orginLayer=0
@ -683,7 +689,54 @@ function this.GodPrintInfo()
end
end
function this.GiftInfo()
local curHeroSoulPrintDatas = {}
-- 没有魂印不显示
if curHeroData.giftIds==nil or #curHeroData.giftIds==0 then
this.giftInfo.gameObject:SetActive(false)
this.backBtn.transform.localPosition = Vector2.New(432.5, 590)
this.bg.transform.sizeDelta = Vector2.New(935, 1250)
this.sc.transform.sizeDelta = Vector2.New(935, 1132)
return
end
this.giftInfo.gameObject:SetActive(true)
this.backBtn.transform.localPosition = Vector2.New(432.5, 690)
this.bg.transform.sizeDelta = Vector2.New(935, 1450)
this.sc.transform.sizeDelta = Vector2.New(935, 1332)
for key, value in pairs(giftList) do
if value then
value:SetActive(false)
end
end
for i=1,#curHeroData.giftIds do
LogError("curHeroData.giftIds[i]==========="..curHeroData.giftIds[i])
end
for i=1,#curHeroData.giftIds do --生成预设
if not giftList[i] then
giftList[i]=newObjToParent(this.giftPre,this.giftGrid)
end
giftList[i].name="Pre"..i
giftList[i]:SetActive(true)
--特效层级重设
for i=1,#giftList do
Util.AddParticleSortLayer(giftList[i], this.sortingOrder- orginLayer2)
end
orginLayer2 = this.sortingOrder
orginLayer=this.sortingOrder
local id=curHeroData.giftIds[i]
--LogError("v==============="..id)
local frame=Util.GetGameObject(giftList[i],"Frame"):GetComponent("Image")
local icon=Util.GetGameObject(giftList[i],"Icon"):GetComponent("Image")
frame.sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(equipConfig[id].Quality))
icon.sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[id].ResourceID))
Util.AddOnceClick(giftList[i],function()
UIManager.OpenPanel(UIName.GodPrintPopUp,0,curHeroData.dynamicId,v)
end)
end
end
--法宝
@ -720,7 +773,10 @@ function this.OnSortingOrderChange()
end
for i=1,#godPrintPreList do
Util.AddParticleSortLayer(godPrintPreList[i], this.sortingOrder- orginLayer)
end
end
for i=1,#giftList do
Util.AddParticleSortLayer(giftList[i], this.sortingOrder- orginLayer)
end
for i = 1,#this.shenhunList do
Util.SetParticleSortLayer(this.shenhunList[i].fx_shenhun,this.sortingOrder + 1)
end

View File

@ -34,6 +34,10 @@ function Practice:InitComponent()
self.gemBtn = Util.GetGameObject(self.Btns, "rightGrid/gemBtn")
self.gemRedPoint = Util.GetGameObject(self.gemBtn, "redPoint")
Util.GetGameObject(self.Btns, "rightGrid/gemBtn"):GetComponent("Image").sprite=self.spLoader:LoadSprite("x_xiuxing_mingge_zh")
self.giftBtn = Util.GetGameObject(self.Btns, "rightGrid/giftBtn")
self.gemRedPoint = Util.GetGameObject(self.giftBtn, "redPoint")
Util.GetGameObject(self.Btns, "rightGrid/giftBtn"):GetComponent("Image").sprite=self.spLoader:LoadSprite("s_gift_player_zh")
self.fourQuadrantBtn = Util.GetGameObject(self.Btns, "rightGrid/yushenBtn")
self.fourQuadrantRedPoint = Util.GetGameObject(self.fourQuadrantBtn, "redPoint")
self.starNum = Util.GetGameObject(self.starBtn, "starNum"):GetComponent("Text")
@ -111,6 +115,9 @@ function Practice:BindEvent()
UIManager.OpenPanel(UIName.RoleProInfoPopup,PracticeManager.GetCurAllGetAddForShow(),nil,false,nil)
end)
Util.AddClick(self.giftBtn, function()
UIManager.OpenPanel(UIName.PlayerGiftPanel)
end)
Util.AddClick(self.gemBtn, function()
local isOpen= CheckFunctionOpen(FUNCTION_OPEN_TYPE.GemNew)
if isOpen then

View File

@ -0,0 +1,315 @@
require("Base/BasePanel")
local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local giftConfig=ConfigManager.GetConfig(ConfigName.GiftConfig)
PlayerGiftPanel = Inherit(BasePanel)
local isGonming = 0
local tableName={ "礼物","碎片"}
local isUpZhen = false
local this = PlayerGiftPanel
local indexBtnNum=0
local tabs={}
local redTabs={}
local curHeroData=nil
local teamHero
local v1
local allUpIds={}
--初始化组件用于子类重写RoleEquipChangePopup
function PlayerGiftPanel:InitComponent()
this.spLoader = SpriteLoader.New()
this.bg2 = Util.GetGameObject(self.transform, "bg2")
screenAdapte(this.bg2)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, {showType = UpViewOpenType.ShowLeft})
this.btnBack = Util.GetGameObject(self.transform, "btnBack/btnBack")
for i = 1, 2 do
tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i)
local nameTxt=Util.GetGameObject(tabs[i], "Text"):GetComponent("Text")
nameTxt.fontSize = GetCurLanguage() == 0 and 48 or 40
nameTxt.text=tableName[i]
redTabs[i] = Util.GetGameObject(tabs[i], "red")
if i==2 then
tabs[i]:SetActive(false)
end
--effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect")
end
this.titleTxt=Util.GetGameObject(self.gameObject, "title"):GetComponent("Text")
this.titleTxt.text="主角礼物"
this.selectBtn = Util.GetGameObject(self.gameObject, "selectBtn")
this.btnPrant = Util.GetGameObject(self.gameObject, "Tabs")
this.equipPreList2 = {}
this.equipPreList = {}
this.equipPre = Util.GetGameObject(self.gameObject, "equipPre")
this.upItemPre = Util.GetGameObject(self.gameObject, "upItemPre")
this.grid = Util.GetGameObject(self.gameObject, "scroll/grid")
this.selsectSkillImage = Util.GetGameObject(self.gameObject, "selsectSkillImage")
this.ScrollBar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.transform, "scroll").transform,
this.equipPre, this.ScrollBar,Vector2.New(v2.width, v2.height),1 , 5, Vector2.New(40, 15))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
v1 = Util.GetGameObject(self.gameObject, "upScroll"):GetComponent("RectTransform").rect
this.UpScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.transform, "upScroll").transform,this.upItemPre, nil,Vector2.New(v1.width,v1.height),1 ,4, Vector2.New(50,42))
this.UpScrollView.moveTween.MomentumAmount = 1
this.UpScrollView.moveTween.Strength = 1
Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh")
this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text")
this.itemNumText = Util.GetGameObject(self.transform, "itemNumText"):GetComponent("Text")
this.upLvEffect = Util.GetGameObject(self.transform, "powerBtn/effect")
this.emptyObj = Util.GetGameObject(self.transform, "emptyObj")
this.emptyObj.gameObject:SetActive(false)
this.mask = Util.GetGameObject(self.gameObject, "mask")
this.mask:SetActive(false)
this.lvTxt=Util.GetGameObject(self.gameObject, "collectLv"):GetComponent("Text")
this.collectImg=Util.GetGameObject(self.gameObject, "collectImg"):GetComponent("Image")
this.collectImg.sprite=this.spLoader:LoadSprite("gh_tt_8")
this.barImg=Util.GetGameObject(self.gameObject, "progressbar/progress1"):GetComponent("Image")
this.barNum=Util.GetGameObject(self.gameObject, "progressbar/num"):GetComponent("Text")
end
--绑定事件(用于子类重写)
function PlayerGiftPanel:BindEvent()
Util.AddClick(this.btnBack,function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
for i = 1, 2 do
Util.AddClick(tabs[i],function()
-- isPlayAnim = true
if i == indexBtnNum then
return
end
indexBtnNum = i
this:OnClickTabBtn(indexBtnNum)
end)
end
end
--添加事件监听(用于子类重写)
function PlayerGiftPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.RefreshWindowData)
end
--移除事件监听(用于子类重写)
function PlayerGiftPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.RefreshWindowData)
end
--界面打开时调用(用于子类重写)
function PlayerGiftPanel:OnOpen(...)
local data = {...}
end
function PlayerGiftPanel:OnShow()
teamHero = FormationManager.GetAllMainFormationHeroId()
this.RefreshWindowData()
end
function this:OnSortingOrderChange()
end
--右切换按钮点击
function this:RightBtnOnClick()
end
--左切换按钮点击
function this:LeftBtnOnClick()
end
local collectNum=0
function this.RefreshWindowData()
collectNum=0
local WarPower = 0
for i = 1, #teamHero do
WarPower = WarPower+ HeroPowerManager.GetHeroPower(teamHero[i],FormationTypeDef.FORMATION_NORMAL)
end
WarPower=WarPower+PracticeManager.GetPracticeAddPower()
this.force.text = WarPower
--显示上面赠送的
local list=GiftManager.GetPlayerGifts()
local maxNum=16
if #list>maxNum then
maxNum=#list+4
end
local giftDatas={}
for i=1,maxNum do
local data={}
if i<=#list then
data.id=list[i]
end
table.insert(giftDatas,data)
end
allUpIds={}
this.UpScrollView:SetData(giftDatas,
function(index, go)
this.SingleUpItemShow(go, giftDatas[index])
table.insert(allUpIds,giftDatas[index].id)
end
)
--显示收集度
local lv=0
local maxValue=0
for k, v in ConfigPairs(giftConfig) do
if collectNum>=v.Gift then
lv=v.Id
maxValue=v.Gift
else
maxValue=v.Gift
break
end
end
this.lvTxt.text="收集值等级 "..lv
this.barNum.text=collectNum.."/"..maxValue
this.barImg.fillAmount=collectNum/maxValue
--显示下面可赠送的
this:OnClickTabBtn(1)
end
--显示上面几个
function this.SingleUpItemShow(_go,data)
_go:SetActive(true)
_go.transform:SetAsFirstSibling()
local frame=_go:GetComponent("Image")
local icon=Util.GetGameObject(_go,"icon"):GetComponent("Image")
local name=Util.GetGameObject(_go,"name"):GetComponent("Text")
local add=Util.GetGameObject(_go,"add")
if data.id and data.id~=0 then
frame.sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[data.id].Quantity))
if equipConfig[data.id] then
collectNum=collectNum+equipConfig[data.id].Gift
end
icon.gameObject:SetActive(true)
name.gameObject:SetActive(true)
add:SetActive(false)
name.text=itemConfig[data.id].Name
icon.sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[data.id].ResourceID))
else
frame.sprite=this.spLoader:LoadSprite("r_characterbg_blue")
icon.gameObject:SetActive(false)
name.gameObject:SetActive(false)
add:SetActive(true)
end
end
--点击装备按钮
function this:OnClickTabBtn(_index)
indexBtnNum = _index
this:SetSelectBtn()
local allEquip = BagManager.GetBagItemDataByItemType(ItemBaseType.PlayerGift)
-- this:SortEquipDatas(allEquip)
local count = 0
for i=1,#allEquip do
count = count + 1
if CheckListIsContainValue1(allUpIds,allEquip[i].id) then
allEquip[i].isUp=1
else
allEquip[i].isUp=2
end
end
table.sort(allEquip,function(a,b)
if a.isUp==b.isUp then
if a.quality==b.quality then
return a.id<b.id
else
return a.quality>b.quality
end
else
return a.isUp>b.isUp
end
end)
--"装备数量:"
this.itemNumText.text = "礼物种类:" .. count
this:SetItemData(allEquip)
--this.CheckRedTab()
end
function this:SetItemData(_itemDatas)
if LengthOfTable(_itemDatas) == 0 then
this.emptyObj.gameObject:SetActive(true)
else
this.emptyObj.gameObject:SetActive(false)
end
for k,v in pairs(this.equipPreList) do
v.gameObject:SetActive(false)
end
this.ScrollView:SetData(
_itemDatas,
function(index, go)
this.SingleItemDataShow(go, _itemDatas[index])
end
)
end
function this.SingleItemDataShow(_go, _itemData)
if not itemConfig[_itemData.id] then
return
end
if not this.equipPreList[_go] then
this.equipPreList[_go] = SubUIManager.Open(SubUIConfig.ItemView,_go.transform)
end
local redPoint = Util.GetGameObject(_go.transform, "redPoint")
redPoint:SetActive(false)
this.equipPreList[_go].gameObject:SetActive(true)
this.equipPreList[_go].transform:SetAsFirstSibling()
if itemConfig[_itemData.id].ItemType == ItemType.Equip then
this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1.1, true, false, false, orginLayer,_itemData.idDyn)
-- 0.查看属性 1.穿戴 2.卸下 3.交换
--宝物界面
Util.AddOnceClick(Util.GetGameObject(_go.transform, "mask"),function()
BagManager.isBagPanel=true
if CheckListIsContainValue1(allUpIds,_itemData.id) then
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,0,false,nil,curHeroData,4)
else
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,3,false,nil,curHeroData,4)
end
end
)
end
end
function this:SetSelectBtn()
this.selectBtn:SetActive(true)
this.selectBtn.transform:SetParent(tabs[indexBtnNum].transform)
this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(-12.28, 1.08, 0)
this.selectBtn.transform:SetSiblingIndex(1)
Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = GetCurLanguage() == 0 and tableName[indexBtnNum] or "<size=40>"..tableName[indexBtnNum].."</size>"--typeTab[indexBtnNum]
end
--选择图片设置父级
function this.SelectImageSetParent(_objPoint)
this.selsectSkillImage:SetActive(false)
this.selsectSkillImage.transform:SetParent(_objPoint.transform)
this.selsectSkillImage.transform.localScale = Vector3.one
this.selsectSkillImage.transform.localPosition = Vector3.zero
end
--界面关闭时调用(用于子类重写)
function PlayerGiftPanel:OnClose()
BagManager.isBagPanel=false
end
--界面销毁时调用(用于子类重写)
function PlayerGiftPanel:OnDestroy()
end
return PlayerGiftPanel

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: e178ab8686b49f243b090879b4474a7d
timeCreated: 1552897446
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,378 @@
require("Base/BasePanel")
local spcialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
RoleGiftPanel = Inherit(BasePanel)
local isGonming = 0
local tableName={ "礼物","碎片"}
local isUpZhen = false
local this = RoleGiftPanel
local indexBtnNum=0
local tabs={}
local redTabs={}
local curHeroData=nil
local teamHero
local v1
local allUpIds={}
local allEquip={}
local index=0
local lv,curNum,maxNum
local heroListData
local isDown=false
--初始化组件用于子类重写RoleEquipChangePopup
function RoleGiftPanel:InitComponent()
this.spLoader = SpriteLoader.New()
this.bg2 = Util.GetGameObject(self.transform, "bg2")
screenAdapte(this.bg2)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, {showType = UpViewOpenType.ShowLeft})
this.btnBack = Util.GetGameObject(self.transform, "btnBack/btnBack")
for i = 1, 2 do
tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i)
local nameTxt=Util.GetGameObject(tabs[i], "Text"):GetComponent("Text")
nameTxt.fontSize = GetCurLanguage() == 0 and 48 or 40
nameTxt.text=tableName[i]
redTabs[i] = Util.GetGameObject(tabs[i], "red")
if i==2 then
tabs[i]:SetActive(false)
end
--effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect")
end
this.titleTxt=Util.GetGameObject(self.gameObject, "title"):GetComponent("Text")
this.titleTxt.text="神将礼物"
this.selectBtn = Util.GetGameObject(self.gameObject, "selectBtn")
this.btnPrant = Util.GetGameObject(self.gameObject, "Tabs")
this.equipPreList2 = {}
this.equipPreList = {}
this.equipPre = Util.GetGameObject(self.gameObject, "equipPre")
this.upItemPre = Util.GetGameObject(self.gameObject, "upItemPre")
this.grid = Util.GetGameObject(self.gameObject, "scroll/grid")
this.selsectSkillImage = Util.GetGameObject(self.gameObject, "selsectSkillImage")
this.leftBtn = Util.GetGameObject(self.transform, "leftBtn/GameObject")
this.rightBtn = Util.GetGameObject(self.transform, "rightBtn/GameObject")
this.allEquipUp = Util.GetGameObject(self.transform, "allEquipUp")
this.allEquipDown = Util.GetGameObject(self.transform, "allEquipDown")
this.allEquipUpRedPoint = Util.GetGameObject(self.transform, "allEquipUp/redPoint")
this.allEquipUpRedPoint:SetActive(false)
this.ScrollBar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.transform, "scroll").transform,
this.equipPre, this.ScrollBar,Vector2.New(v2.width, v2.height),1 , 5, Vector2.New(40, 15))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
v1 = Util.GetGameObject(self.gameObject, "upScroll"):GetComponent("RectTransform").rect
this.UpScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.transform, "upScroll").transform,this.upItemPre, nil,Vector2.New(v1.width,v1.height),1 ,4, Vector2.New(50,42))
this.UpScrollView.moveTween.MomentumAmount = 1
this.UpScrollView.moveTween.Strength = 1
Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh")
this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text")
this.itemNumText = Util.GetGameObject(self.transform, "itemNumText"):GetComponent("Text")
this.upLvEffect = Util.GetGameObject(self.transform, "powerBtn/effect")
this.emptyObj = Util.GetGameObject(self.transform, "emptyObj")
this.emptyObj.gameObject:SetActive(false)
this.mask = Util.GetGameObject(self.gameObject, "mask")
this.mask:SetActive(false)
this.collectImg=Util.GetGameObject(self.gameObject, "collectImg"):GetComponent("Image")
this.lvTxt=Util.GetGameObject(self.gameObject, "lvTxt"):GetComponent("Text")
this.collectImg.sprite=this.spLoader:LoadSprite("gh_tt_8")
end
--绑定事件(用于子类重写)
function RoleGiftPanel:BindEvent()
Util.AddClick(this.btnBack,function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
Util.AddClick(this.leftBtn,function()
index = (index - 1 > 0 and index - 1 or #heroListData)
curHeroData = heroListData[index]
this.RefreshWindowData()
end)
Util.AddClick(this.rightBtn,function()
index = (index + 1 <= #heroListData and index + 1 or 1)
curHeroData = heroListData[index]
this.RefreshWindowData()
end)
Util.AddOnceClick(this.allEquipUp,function()
local canNum=curNum-#allUpIds
if canNum>0 then
local list={}
for i=1,#allEquip do
if i<=canNum then
if CheckListIsContainValue1(allUpIds,allEquip[i].id)==false then
table.insert(list,allEquip[i].id)
end
end
end
NetManager.GiftEquipWearRequest(1,curHeroData.dynamicId,list,function()
GiftManager.SetHeroGift(curHeroData.dynamicId,list,1)
this.RefreshWindowData()
end)
end
end)
Util.AddOnceClick(this.allEquipDown,function()
LogError("allupids len 1111111111111111======"..#allUpIds)
isDown=true
NetManager.GiftEquipWearRequest(2,curHeroData.dynamicId,allUpIds,function()
isDown=false
LogError("allupids len======"..#allUpIds)
GiftManager.SetHeroGift(curHeroData.dynamicId,allUpIds,2)
this.RefreshWindowData()
end)
end)
for i = 1, 2 do
Util.AddClick(tabs[i],function()
-- isPlayAnim = true
if i == indexBtnNum then
return
end
indexBtnNum = i
this:OnClickTabBtn(indexBtnNum)
end)
end
end
--添加事件监听(用于子类重写)
function RoleGiftPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.RefreshWindowData)
end
--移除事件监听(用于子类重写)
function RoleGiftPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.RefreshWindowData)
end
--界面打开时调用(用于子类重写)
function RoleGiftPanel:OnOpen(...)
local data = {...}
curHeroData=data[1]
if data[2] then
heroListData = data[2]
else
heroListData = HeroManager.GetAllHeroDatas()
end
end
function RoleGiftPanel:OnShow()
for i = 1, #heroListData do
if curHeroData == heroListData[i] then
index = i
end
end
teamHero = FormationManager.GetAllMainFormationHeroId()
this.RefreshWindowData()
end
function this:OnSortingOrderChange()
end
function this.RefreshWindowData()
local WarPower = 0
if isDown then
return
end
isUpZhen=teamHero[curHeroData.dynamicId]
if isUpZhen then
WarPower = HeroPowerManager.GetHeroPower(curHeroData.dynamicId, FormationTypeDef.FORMATION_NORMAL)
else
WarPower = HeroPowerManager.GetHeroPower(curHeroData.dynamicId)
end
this.force.text = WarPower
--显示上面赠送的
local list=GiftManager.GetHeroGifts(curHeroData.dynamicId)
LogError("当前英雄穿戴 礼物数量 "..#list)
lv,curNum,maxNum=GiftManager.GetCollectLvAndNum()
this.lvTxt.text="收集度"..lv..""
LogError("lv========="..lv.." curnum=="..curNum.." maxNum=="..maxNum)
--local maxNum=20
local giftDatas={}
for i=1,maxNum do
local data={}
if i<=#list then
data.id=list[i]
end
table.insert(giftDatas,data)
end
allUpIds={}
this.UpScrollView:SetData(giftDatas,
function(index, go)
this.SingleUpItemShow(go, giftDatas[index],index)
if giftDatas[index].id and giftDatas[index].id~=0 then
table.insert(allUpIds,giftDatas[index].id)
end
end
)
--显示下面可赠送的
this:OnClickTabBtn(1)
end
--显示上面几个
function this.SingleUpItemShow(_go,data,_index)
_go:SetActive(true)
_go.transform:SetAsFirstSibling()
local frame=_go:GetComponent("Image")
local icon=Util.GetGameObject(_go,"icon"):GetComponent("Image")
local name=Util.GetGameObject(_go,"name"):GetComponent("Text")
local lockObj=Util.GetGameObject(_go,"lock")
local lockText=Util.GetGameObject(_go,"Text"):GetComponent("Text")
local add=Util.GetGameObject(_go,"add")
if data.id and data.id~=0 then
frame.sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[data.id].Quantity))
icon.gameObject:SetActive(true)
name.gameObject:SetActive(true)
lockObj:SetActive(false)
lockText.gameObject:SetActive(false)
add:SetActive(false)
name.text=itemConfig[data.id].Name
icon.sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[data.id].ResourceID))
Util.AddOnceClick(icon.gameObject,function()
if curHeroData==nil then
LogError("curherodata================nil")
return
end
BagManager.isBagPanel=false
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,data,2,false,nil,curHeroData,4)
end
)
else
frame.sprite=this.spLoader:LoadSprite("r_characterbg_blue")
icon.gameObject:SetActive(false)
name.gameObject:SetActive(false)
if _index>curNum then
lockObj:SetActive(true)
add:SetActive(false)
lockText.gameObject:SetActive(true)
lockText.text="收集度"..lv+1 .."级解锁"
else
lockObj:SetActive(false)
lockText.gameObject:SetActive(false)
add:SetActive(true)
end
end
end
--点击装备按钮
function this:OnClickTabBtn(_index)
indexBtnNum = _index
this:SetSelectBtn()
allEquip = BagManager.GetBagItemDataByItemType(ItemBaseType.HeroGift)
-- this:SortEquipDatas(allEquip)
local count = 0
for i=1,#allEquip do
count = count + 1
if CheckListIsContainValue1(allUpIds,allEquip[i].id) then
allEquip[i].isUp=1
else
allEquip[i].isUp=2
end
end
table.sort(allEquip,function(a,b)
if a.isUp==b.isUp then
if a.quality==b.quality then
return a.id<b.id
else
return a.quality>b.quality
end
else
return a.isUp>b.isUp
end
end)
--"装备数量:"
this.itemNumText.text = "礼物种类:" .. count
this:SetItemData(allEquip)
--this.CheckRedTab()
end
function this:SetItemData(_itemDatas)
if LengthOfTable(_itemDatas) == 0 then
this.emptyObj.gameObject:SetActive(true)
else
this.emptyObj.gameObject:SetActive(false)
end
for k,v in pairs(this.equipPreList) do
v.gameObject:SetActive(false)
end
this.ScrollView:SetData(
_itemDatas,
function(index, go)
this.SingleItemDataShow(go, _itemDatas[index])
end
)
end
function this.SingleItemDataShow(_go, _itemData)
if not itemConfig[_itemData.id] then
return
end
if not this.equipPreList[_go] then
this.equipPreList[_go] = SubUIManager.Open(SubUIConfig.ItemView,_go.transform)
end
local redPoint = Util.GetGameObject(_go.transform, "redPoint")
redPoint:SetActive(false)
this.equipPreList[_go].gameObject:SetActive(true)
this.equipPreList[_go].transform:SetAsFirstSibling()
if itemConfig[_itemData.id].ItemType == ItemType.Equip then
this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1.1, true, false, false, orginLayer,_itemData.idDyn)
-- 0.查看属性 1.穿戴 2.卸下 3.交换
--宝物界面
Util.AddOnceClick(Util.GetGameObject(_go.transform, "mask"),function()
BagManager.isBagPanel=true
if CheckListIsContainValue1(allUpIds,_itemData.id) then
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,0,false,nil,curHeroData,4)
else
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,_itemData,3,false,nil,curHeroData,4)
end
end
)
end
end
function this:SetSelectBtn()
this.selectBtn:SetActive(true)
this.selectBtn.transform:SetParent(tabs[indexBtnNum].transform)
this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(-12.28, 1.08, 0)
this.selectBtn.transform:SetSiblingIndex(1)
Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = GetCurLanguage() == 0 and tableName[indexBtnNum] or "<size=40>"..tableName[indexBtnNum].."</size>"--typeTab[indexBtnNum]
end
--选择图片设置父级
function this.SelectImageSetParent(_objPoint)
this.selsectSkillImage:SetActive(false)
this.selsectSkillImage.transform:SetParent(_objPoint.transform)
this.selsectSkillImage.transform.localScale = Vector3.one
this.selsectSkillImage.transform.localPosition = Vector3.zero
end
--界面关闭时调用(用于子类重写)
function RoleGiftPanel:OnClose()
BagManager.isBagPanel=false
end
--界面销毁时调用(用于子类重写)
function RoleGiftPanel:OnDestroy()
end
return RoleGiftPanel

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 7ebc5dfb3564ac5429ce0f17e6075998
timeCreated: 1552897446
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -116,6 +116,11 @@ function RoleInfoPanel:InitComponent()
this.godPrintImg=Util.GetGameObject(self.transform,"leftGrid/GodprintBtn"):GetComponent("Image")
this.godPrintImg.sprite=this.spLoader:LoadSprite("r_fabao_godPrint_zh")
this.godPrintBtnRedPoint=Util.GetGameObject(this.godPrintBtn,"redPoint")
this.giftBtn=Util.GetGameObject(self.transform,"leftGrid/giftBtn")
this.giftImg=Util.GetGameObject(self.transform,"leftGrid/giftBtn"):GetComponent("Image")
this.giftImg.sprite=this.spLoader:LoadSprite("r_gift_hero_zh")
this.giftRedPoint=Util.GetGameObject(this.giftBtn,"redPoint")
this.PageList = {}
this.GodSoulBtn=Util.GetGameObject(self.transform,"leftGrid/GodSoulBtn")
@ -231,6 +236,10 @@ function RoleInfoPanel:BindEvent()
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
end)
--装备
Util.AddClick(this.giftBtn, function()
UIManager.OpenPanel(UIName.RoleGiftPanel,curHeroData,heroDatas)
end)
--装备
Util.AddClick(this.equipBtn, function()
UIManager.OpenPanel(UIName.RoleEquipPanel,curHeroData,heroDatas,this,isUpZhen)