[寻仙招募]======修改提交

dev_chengFeng
wangzhenxing 2022-05-23 11:29:10 +08:00
parent 7557858517
commit e7df09c284
7 changed files with 473 additions and 87 deletions

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: ffcc7b80b4526254a9787214c9f2af37
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: 1e608b58198c57c4e89d169f2627cdaa
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -573,10 +573,10 @@ RectTransform:
m_Father: {fileID: 8467060635364585861}
m_RootOrder: 2
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 217, y: -37.5}
m_SizeDelta: {x: 100, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8589139664405831713
CanvasRenderer:
@ -637,7 +637,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5014518995866771904
RectTransform:
m_ObjectHideFlags: 0
@ -807,7 +807,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -5584,7 +5584,7 @@ ParticleSystem:
--- !u!199 &6683236217412788304
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -5876,7 +5876,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1482788062847233380
RectTransform:
m_ObjectHideFlags: 0
@ -6253,10 +6253,10 @@ RectTransform:
m_Father: {fileID: 3485561603948649602}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 16, y: -40.5}
m_SizeDelta: {x: 32, y: 32}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3722759562873466134
CanvasRenderer:
@ -6349,7 +6349,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8174691545454135507
RectTransform:
m_ObjectHideFlags: 0
@ -6442,10 +6442,10 @@ RectTransform:
m_Father: {fileID: 3485561603948649602}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 16, y: -16}
m_SizeDelta: {x: 32, y: 32}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5115371620191656276
CanvasRenderer:
@ -6782,6 +6782,7 @@ RectTransform:
- {fileID: 5640906329154212799}
- {fileID: 6424150738340887453}
- {fileID: 6709395645082142174}
- {fileID: 2446839573002420404}
m_Father: {fileID: 7816124763777208762}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6813,6 +6814,80 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &4668915026912685284
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6033035370376337052}
- component: {fileID: 7132813900060172996}
- component: {fileID: 8360015942014354654}
m_Layer: 5
m_Name: select
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6033035370376337052
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668915026912685284}
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: 2446839573002420404}
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: 129, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7132813900060172996
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668915026912685284}
m_CullTransparentMesh: 0
--- !u!114 &8360015942014354654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668915026912685284}
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: 5694d766a5113394e978588bcfa4af7a, 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 &4883800664921298848
GameObject:
m_ObjectHideFlags: 0
@ -7394,10 +7469,10 @@ RectTransform:
m_Father: {fileID: 3485561603948649602}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 16, y: -89.5}
m_SizeDelta: {x: 32, y: 32}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2599489946156940024
CanvasRenderer:
@ -7510,6 +7585,144 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5648487819855904147
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2446839573002420404}
- component: {fileID: 7365318240650836378}
- component: {fileID: 2962785983145898896}
- component: {fileID: 2802269393636534789}
- component: {fileID: 6524875150206836178}
m_Layer: 5
m_Name: store
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2446839573002420404
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5648487819855904147}
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: 6033035370376337052}
m_Father: {fileID: 8772735742504336993}
m_RootOrder: 4
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: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7365318240650836378
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5648487819855904147}
m_CullTransparentMesh: 0
--- !u!114 &2962785983145898896
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5648487819855904147}
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: 60d33d082cec7074180e3742c2428e67, 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!114 &2802269393636534789
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5648487819855904147}
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: 2962785983145898896}
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 &6524875150206836178
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5648487819855904147}
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 &5649620688984234810
GameObject:
m_ObjectHideFlags: 0
@ -8109,10 +8322,10 @@ RectTransform:
m_Father: {fileID: 8467060635364585861}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 129.5, y: -37.5}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6088628336122041328
CanvasRenderer:
@ -8569,10 +8782,10 @@ RectTransform:
m_Father: {fileID: 8467060635364585861}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 46, y: -37.5}
m_SizeDelta: {x: 92, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6403265139877489682
CanvasRenderer:
@ -8650,7 +8863,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -8893,10 +9106,10 @@ RectTransform:
m_Father: {fileID: 8707505760031921771}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 104.5, y: -37.5}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &456025369945251173
CanvasRenderer:
@ -9023,10 +9236,10 @@ RectTransform:
m_Father: {fileID: 3485561603948649602}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 16, y: -114}
m_SizeDelta: {x: 32, y: 32}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8432364738703081031
CanvasRenderer:
@ -9309,10 +9522,10 @@ RectTransform:
m_Father: {fileID: 8707505760031921771}
m_RootOrder: 2
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 179.5, y: -37.5}
m_SizeDelta: {x: 75, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2787941689728704253
CanvasRenderer:
@ -14132,7 +14345,7 @@ ParticleSystem:
--- !u!199 &305727223664186203
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14223,10 +14436,10 @@ RectTransform:
m_Father: {fileID: 8707505760031921771}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 33.5, y: -37.5}
m_SizeDelta: {x: 67, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6789756586190126900
CanvasRenderer:
@ -14288,7 +14501,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8378124066126775923
RectTransform:
m_ObjectHideFlags: 0
@ -14580,10 +14793,10 @@ RectTransform:
m_Father: {fileID: 3485561603948649602}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 16, y: -65}
m_SizeDelta: {x: 32, y: 32}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4368522434947139345
CanvasRenderer:
@ -14792,7 +15005,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1876494193522904164
RectTransform:
m_ObjectHideFlags: 0

View File

@ -464,7 +464,7 @@ PanelType = {
FindFairy = { 87, 16, 15}, -- 东海寻仙
Talisman = {14}, -- 新法宝
Guild = {14, 16, 65}, -- 新法宝
TimelimitCall={87,16}, --限时召唤
TimelimitCall={87,16,1011}, --限时召唤
QianKunBox={1002,1003,16},--乾坤包囊
HeroReplace={14,16,92},--神将置换
LingShou={14,16,21},--灵兽

View File

@ -118,16 +118,33 @@ end
function QianKunBoxBuyOnePanel:GetSendStr()
local str = ""
if lotterySetting[this.recruitType] and lotterySetting[this.recruitType].TenTimesMustGetItem and #lotterySetting[this.recruitType].TenTimesMustGetItem > 0 then
for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do
if str == "" then
str = str.."赠送"
else
str = str..""
LogError("this.recruitType=="..this.recruitType)
if this.recruitType ==50 then
local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if wish and wish.Recruit then
--for k,v in ipairs(wish.Recruit) do
if str == "" then
str = str.."赠送"
else
str = str..""
end
str = str..wish.Recruit[2]..""..ItemConfig[wish.Recruit[1]].Name
--end
end
else
if lotterySetting[this.recruitType] and lotterySetting[this.recruitType].TenTimesMustGetItem and #lotterySetting[this.recruitType].TenTimesMustGetItem > 0 then
for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do
if str == "" then
str = str.."赠送"
else
str = str..""
end
str = str..v[2]..""..ItemConfig[v[1]].Name
end
str = str..v[2]..""..ItemConfig[v[1]].Name
end
end
return str
end
@ -181,6 +198,14 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
Util.ClearChild(Util.GetTransform(this.content, "itemContent1"))
this.itemDataList={}
this.itemDataList=BagManager.GetTableByBackDropData(this.drop)
itemDataList=BagManager.GetTableByBackDropData(this.drop)
if this.recruitType==50 then
for key, value in pairs(itemDataList) do
if value.sId==1011 then
table.removebyvalue(itemDataList,value)
end
end
end
this.view = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(this.content, "itemContent1"))
this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder)
@ -197,8 +222,8 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
end, 0.5)
time:Start()
if isLimitUpHero then
this.detailImage:SetActive(false)
this.detailImage3:SetActive(false)
-- this.detailImage:SetActive(false)
-- this.detailImage3:SetActive(false)
end
end
--界面关闭时调用(用于子类重写)

View File

@ -125,16 +125,33 @@ end
function QianKunBoxBuyTenPanel:GetSendStr()
local str = ""
if lotterySetting[this.recruitType] and lotterySetting[this.recruitType].TenTimesMustGetItem and #lotterySetting[this.recruitType].TenTimesMustGetItem > 0 then
for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do
if str == "" then
str = str.."赠送"
else
str = str..""
LogError("this.recruitType=="..this.recruitType)
local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if this.recruitType==51 then
if wish and wish.Recruit then
-- for k,v in ipairs(wish.Recruit) do
if str == "" then
str = str.."赠送"
else
str = str..""
end
str = str.."10"..""..ItemConfig[wish.Recruit[1]].Name
-- end
end
else
if lotterySetting[this.recruitType] and lotterySetting[this.recruitType].TenTimesMustGetItem and #lotterySetting[this.recruitType].TenTimesMustGetItem > 0 then
for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do
if str == "" then
str = str.."赠送"
else
str = str..""
end
str = str..v[2]..""..ItemConfig[v[1]].Name
end
str = str..v[2]..""..ItemConfig[v[1]].Name
end
end
return str
end
--界面打开时调用(用于子类重写)
@ -184,12 +201,17 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
itemNum=d[2]
this.itemIcon3.sprite=this.spLoader:LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
this.itemNum3.text= tostring(itemNum)
local str = this:GetSendStr()
this.detailText.text = str
this.detailText1.text = str
this.detailText2.text = str
local itemDataList={}
LogError("#drop len=="..#this.drop)
itemDataList=BagManager.GetTableByBackDropData(this.drop)
if this.recruitType==51 then
for key, value in pairs(itemDataList) do
if value.sId==1011 then
table.removebyvalue(itemDataList,value)
end
end
end
this.openTenAgainButton:GetComponent("Button").enabled=false
this.btnBack:GetComponent("Button").enabled=false
callList:Clear()
@ -199,6 +221,10 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
end)
this.views = {}
this.itemDataList = itemDataList
local str = this:GetSendStr()
this.detailText.text = str
this.detailText1.text = str
this.detailText2.text = str
local dataNum = #itemDataList > 10 and 10 or #itemDataList
for i = dataNum, 1, -1 do
Util.ClearChild(this.contentList[i].transform)
@ -225,8 +251,8 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
end
callList:Pop()()
if isLimitUpHero then
this.detailImage:SetActive(false)
this.detailImage3:SetActive(false)
-- this.detailImage:SetActive(false)
-- this.detailImage3:SetActive(false)
end
end

View File

@ -31,6 +31,7 @@ function TimeLimitUpHero:InitComponent()
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.btnActivity = Util.GetGameObject(self.gameObject,"btngroup/btnActivity")
self.btnStore = Util.GetGameObject(self.gameObject,"btngroup/store")
self.btnActivity:GetComponent("Image").sprite=self.spLoader:LoadSprite("r_shilian-jiangli_zh")
self.btns = {}
@ -108,6 +109,9 @@ function TimeLimitUpHero:BindEvent()
Util.AddOnceClick(self.btnActivity, function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,Setting.QAId,ActivityTypeDef.LimitUpHero,PRE_REWARD_POOL_TYPE.TIME_LIMITED_NEW,PRE_REWARD_POOL_TYPE.TIME_LIMITED_NEW_UP,curHeroId,self.actId)
end)
Util.AddOnceClick(self.btnStore, function()
JumpManager.GoJump(40068)
end)
end
--添加事件监听(用于子类重写)

View File

@ -95,13 +95,21 @@ function this:Refresh(_page)
local heroDatas={}
for i = 1, #heros do
local CONFIG = heros[i][2] == 6 and itemConfig or heroConfig
LogError(heros[i][1].." "..heros[i][2].." "..heros[i][3])
local CONFIG = itemConfig --heros[i][2] == 6 and itemConfig or heroConfig
if CONFIG[heros[i][1]] then
if not heroDatas[heros[i][2]] then
heroDatas[heros[i][2]] = {}
end
LogError("groupid=="..CONFIG[heros[i][1]].RewardGroup[1])
local group=ConfigManager.TryGetConfigData(ConfigName.RewardGroup,CONFIG[heros[i][1]].RewardGroup[1])
if group then
-- LogError("group.ShowItem[1]=="..group.ShowItem[1])
-- LogError("group.ShowItem[1][1]=="..group.ShowItem[1][1])
end
-- 特殊物品 或者 加入了版本的神将
if heros[i][2] == 6 or HeroManager.InVersion(heros[i][1]) then
if heros[i][2] == 6 or (group and HeroManager.InVersion(group.ShowItem[1][1]) ) then
table.insert(heroDatas[heros[i][2]],{CONFIG[heros[i][1]],heros[i][2],heros[i][3],heros[i][1]})
end
end
@ -138,14 +146,14 @@ function this.SingleHeroDataShow(go,_heroData,_index)
local choosed = Util.GetGameObject(_go.transform, "choosed")
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
if itemType ~= 6 then
name.text = SubString2(GetLanguageStrById(heroData.ReadingName),8)
icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.Icon].Name)
proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15)
frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung")
numText.gameObject:SetActive(false)
else
-- if itemType ~= 6 then
-- name.text = SubString2(GetLanguageStrById(heroData.ReadingName),8)
-- icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.Icon].Name)
-- proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
-- SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15)
-- frame.sprite = this.spLoader:LoadSprite("t_tongyong_topkaung")
-- numText.gameObject:SetActive(false)
-- else
name.text = SubString2(GetLanguageStrById(heroData.Name),8)
icon.sprite = this.spLoader:LoadSprite(artResourcesConfig[heroData.ResourceID].Name)
proIcon.gameObject:SetActive(false)
@ -158,7 +166,7 @@ function this.SingleHeroDataShow(go,_heroData,_index)
chipImg.sprite=this.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(heroData.Quantity))
-- body
end
end
--end
this.choosedList[go] = choosed
this.choosedList[go]:SetActive( heroData.Id==currHeroId)