Merge branch 'china/local' into china/test

dev_chengFeng hotfix/mht_china/xq/cdn_xq_release/0.1.28
JieLing 2021-06-21 14:14:19 +08:00
commit 05f9f121d1
17 changed files with 277 additions and 61 deletions

View File

@ -1 +1 @@
{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"1"}, "PACKAGE_CC_CODE":{"desc":"", "versionCode":"1", "isActive":"1", "value":"1001"}}}
{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"1"}, "PACKAGE_CC_CODE":{"desc":"", "versionCode":"1", "isActive":"1", "value":"1001"}, "CURVED_TEXT_CODE":{"desc":"", "versionCode":"30", "isActive":"1"}}}

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 KiB

View File

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

View File

@ -269,6 +269,7 @@ RectTransform:
m_Children:
- {fileID: 4417430539546789894}
- {fileID: 1244728192338505999}
- {fileID: 4625614315163934248}
m_Father: {fileID: 1827622887959451477}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -53964,6 +53965,85 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
curveMultiplier: 1
--- !u!1 &6863837707722863478
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4625614315163934248}
- component: {fileID: 2187322521100531072}
- component: {fileID: 4345863760146967087}
m_Layer: 5
m_Name: tip1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4625614315163934248
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6863837707722863478}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children: []
m_Father: {fileID: 6911654621547605813}
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: 1.4, y: -62.4}
m_SizeDelta: {x: 760.2, y: 84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2187322521100531072
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6863837707722863478}
m_CullTransparentMesh: 0
--- !u!114 &4345863760146967087
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6863837707722863478}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9960785, g: 0.9803922, b: 0.7725491, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 65
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 65
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5373\u53EF\u9886\u53D6\u8D85\u7EA7\u8C6A\u793C"
--- !u!1 &7119351493522324219
GameObject:
m_ObjectHideFlags: 0

View File

@ -4644,7 +4644,7 @@ ParticleSystem:
--- !u!199 &1481527221194107646
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -4812,8 +4812,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 3.3000083, y: 0.7}
m_SizeDelta: {x: 160, y: 42}
m_AnchoredPosition: {x: -0.0000076293945, y: 0.7}
m_SizeDelta: {x: 124, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1481527221224638891
CanvasRenderer:
@ -4860,9 +4860,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -10638,7 +10638,7 @@ ParticleSystem:
--- !u!199 &1481527221797319403
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15867,7 +15867,7 @@ ParticleSystem:
--- !u!199 &1481527222190047225
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20644,7 +20644,7 @@ ParticleSystem:
--- !u!199 &1481527222294757571
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -25630,7 +25630,7 @@ ParticleSystem:
--- !u!199 &1481527222605618109
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30319,7 +30319,7 @@ ParticleSystem:
--- !u!199 &1481527222633079609
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35352,7 +35352,7 @@ ParticleSystem:
--- !u!199 &1481527223089183893
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35915,8 +35915,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 3.3, y: 0.7}
m_SizeDelta: {x: 160, y: 42}
m_AnchoredPosition: {x: -0.000035286, y: 0.7}
m_SizeDelta: {x: 124, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8666283234259745668
CanvasRenderer:
@ -35963,9 +35963,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -36009,8 +36009,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 3.3, y: 0.7}
m_SizeDelta: {x: 160, y: 42}
m_AnchoredPosition: {x: 0.000020503998, y: 0.7}
m_SizeDelta: {x: 124, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7229865422772331511
CanvasRenderer:
@ -36057,9 +36057,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1

View File

@ -549,7 +549,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -44}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2384432804281337263
@ -666,10 +666,10 @@ RectTransform:
m_Father: {fileID: 2384432804281337260}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -192.6}
m_SizeDelta: {x: -2, y: -719.2}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -192.59998}
m_SizeDelta: {x: 1078, y: 1200.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3090490801835799772
CanvasRenderer:
@ -817,7 +817,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 319.8, y: -525.3}
m_AnchoredPosition: {x: 239, y: -518}
m_SizeDelta: {x: 440.5, y: 53.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9074871151966575624

View File

@ -129,7 +129,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -209.615, y: 71.95}
m_AnchoredPosition: {x: -195.20065, y: 71.95}
m_SizeDelta: {x: 0, y: 144}
m_Pivot: {x: 0, y: 1.0000001}
--- !u!114 &8585533787268794185
@ -159,7 +159,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 27
m_Left: 3
m_Right: 0
m_Top: 0
m_Bottom: 0
@ -490,10 +490,10 @@ RectTransform:
m_Father: {fileID: 2265465264857924457}
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: 575.83, y: -25.3}
m_SizeDelta: {x: 1030.63, y: 27.87}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -7.5, y: 55.7}
m_SizeDelta: {x: 15, y: 27.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6093738831063807161
CanvasRenderer:
@ -569,10 +569,10 @@ RectTransform:
m_Father: {fileID: 8749964550444904214}
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: 411, y: -48}
m_SizeDelta: {x: 291.2, y: 49.4}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -68, y: -47.400024}
m_SizeDelta: {x: 210, y: 49.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3161461349742049117
CanvasRenderer:
@ -15297,10 +15297,10 @@ RectTransform:
m_Father: {fileID: 2265465264857924457}
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: 540, y: -100.21}
m_SizeDelta: {x: 1080, y: 121.95}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -19.21}
m_SizeDelta: {x: 0, y: 121.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5344225242558715882
GameObject:
@ -15432,8 +15432,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 48.62, y: -0.049988}
m_SizeDelta: {x: 419.23, y: 144.1}
m_AnchoredPosition: {x: 55, y: -0.049988}
m_SizeDelta: {x: 390.4, y: 144.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2850623819429736862
MonoBehaviour:
@ -15682,7 +15682,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000009162182, y: 72.00005}
m_AnchoredPosition: {x: 0.0000040801206, y: 72.00005}
m_SizeDelta: {x: 0, y: 144}
m_Pivot: {x: 0.5, y: 1.0000001}
--- !u!114 &481412267603928015
@ -15761,7 +15761,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -133.1, y: 5.200012}
m_AnchoredPosition: {x: -68, y: 16.7}
m_SizeDelta: {x: 210, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2785524628303876487
@ -15922,8 +15922,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.64}
m_SizeDelta: {x: 1080, y: 161.18}
m_AnchoredPosition: {x: 9.3, y: 0.64}
m_SizeDelta: {x: 896.1, y: 161.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &379465581532744733
CanvasRenderer:

View File

@ -18,6 +18,7 @@ ServerConfigManager.SettingConfig = {
PACKAGE_CONFIG = "PACKAGE_CONFIG", -- 包配置
IS_NO_TALKING = "IS_NO_TALKING", -- 禁言
IS_LOAD_STREAMING = "IS_LOAD_STREAMING", -- 是否加载外部资源
CURVED_TEXT_CODE = "CURVED_TEXT_CODE", -- 是否加载外部资源
}

View File

@ -37,8 +37,16 @@ function DailyRechargePanel:InitComponent()
self.extra = Util.GetGameObject(self.backBtn,"bg/descbg")
self.extraIcon = Util.GetGameObject(self.extra,"extraIcon"):GetComponent("Image")
self.extraTip = Util.GetGameObject(self.extra,"tip"):GetComponent("Text")
local extraTip1 = Util.GetGameObject(self.extra,"tip1"):GetComponent("Text")
local extraTip2 = Util.GetGameObject(self.extra,"tip"):GetComponent("Text")
extraTip1.gameObject:SetActive(false)
extraTip2.gameObject:SetActive(false)
if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.CURVED_TEXT_CODE) then
self.extraTip = extraTip2
else
self.extraTip = extraTip1
end
self.extraTip.gameObject:SetActive(true)
self.rewardContent = {}
self.rewardContentEffect = {}
self.rewardContentbg = {}

View File

@ -286,6 +286,12 @@ end
--界面关闭时调用(用于子类重写)
function ActivityMainPanel:OnClose()
if UIManager.IsOpen(UIName.RewardItemSingleShowPopup) then
UIManager.ClosePanel(UIName.RewardItemSingleShowPopup)
end
if UIManager.IsOpen(UIName.HelpPopup) then
UIManager.ClosePanel(UIName.HelpPopup)
end
--清除红点
for k,v in pairs(redPointTypeList) do
ClearRedPointObject(k,v)

View File

@ -35,7 +35,10 @@ end
--移除事件监听(用于子类重写)
function XianShiShangShi:RemoveListener()
end
local sortingOrder = 0
function XianShiShangShi:OnSortingOrderChange()
end
--界面打开时调用(用于子类重写)
function XianShiShangShi:OnOpen()
@ -43,7 +46,7 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function XianShiShangShi:OnShow(_sortingOrder,_parent)
sortingOrder = _sortingOrder
self.sortingOrder = _sortingOrder
parent = _parent
this:OnShowData(true,true)
XianShiShangShi:SetTime()
@ -133,7 +136,7 @@ function this.SingleDataShow(pre,value)
end
for i = 1, #shows do
if itemsGrid[pre][i] then
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder)
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,self.sortingOrder)
itemsGrid[pre][i].gameObject:SetActive(true)
end
end
@ -149,7 +152,7 @@ function this.SingleDataShow(pre,value)
obj.gameObject:SetActive(true)
end
for i = 1, #shows do
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder)
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,self.sortingOrder)
itemsGrid[pre][i].gameObject:SetActive(true)
end
end
@ -166,11 +169,6 @@ function this.SingleDataShow(pre,value)
end)
end
--界面打开时调用(用于子类重写)
function XianShiShangShi:OnOpen()
end
function this.RechargeSuccessFunc(id)
FirstRechargeManager.RefreshAccumRechargeValue(id)
this.OnShowData(false,false)

View File

@ -77,7 +77,9 @@ function XiangYaoDuoBao:BindEvent()
self.btn:SetActive(false)
coroutine.wait(2.5)
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
self.btn:SetActive(true)
if self.btn then
self.btn:SetActive(true)
end
end)
end)
end
@ -368,6 +370,7 @@ function XiangYaoDuoBao:OnDestroy()
poolManager:UnLoadLive(bgName, Live)
end
Live = nil
self.btn = nil
end
--添加事件监听(用于子类重写)

View File

@ -34,7 +34,6 @@ end
--绑定事件(用于子类重写)
function FuXingGaoZhaoPanel:BindEvent()
Util.AddClick(self.backBtn,function ()
CheckRedPointStatus(RedPointType.FuXingGaoZhaoPanel)
self:ClosePanel()
end)
@ -112,6 +111,7 @@ function FuXingGaoZhaoPanel:OnShow(_sortingOrder)
FuXingGaoZhaoManager.InitRewardData()
self:Refresh()
end
function FuXingGaoZhaoPanel:Refresh()
@ -127,6 +127,7 @@ function FuXingGaoZhaoPanel:Refresh()
for i = 1, #self.rewardList do
self:SetSingleReward(self.rewardList[i],self.data.rewards[i],i)
end
CheckRedPointStatus(RedPointType.FuXingGaoZhao)
end
function FuXingGaoZhaoPanel:SetBtn()

View File

@ -785,6 +785,9 @@ function EndLessMapView:OnClose()
if UIManager.IsOpen(UIName.HelpPopup) then
UIManager.ClosePanel(UIName.HelpPopup)
end
if UIManager.IsOpen(UIName.ShowEnemyInfoPanel) then
UIManager.ClosePanel(UIName.ShowEnemyInfoPanel)
end
end
function EndLessMapView:OnDestroy()

View File

@ -36,6 +36,7 @@ function CommonActPage:InitComponent()
self.scrollItem = Util.GetGameObject(self.gameObject, "scrollItem")
self.scrollItemPos = self.scrollItem.transform.localPosition
self.scrollItemRect = self.scrollItem.transform.rect
self.time = Util.GetGameObject(self.gameObject, "time")
self.timeText = Util.GetGameObject(self.time, "timeText"):GetComponent("Text")
self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp")
@ -131,8 +132,8 @@ function CommonActPage:OnShow(_sortingOrder)
end
if not self.scrollView then
local rootHight = self.scrollItem.transform.rect.height
local width = self.scrollItem.transform.rect.width
local rootHight = self.scrollItemRect.height
local width = self.scrollItemRect.width
if self.actType == ActivityTypeDef.DynamicAct then
self.itemPre:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,225)
local vec = self.scrollItem.transform.localPosition

View File

@ -128,6 +128,8 @@ function TenRecruitPanel:OnOpen(...)
maxTimesId=lotterySetting[type].MaxTimes --特权上限ID
if recruitType and recruitType[1] and recruitType[1] == RecruitType.TimeLimitTen then
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.TenRecruit })
elseif recruitType and recruitType[1] and recruitType[1] == RecruitType.XiangYaoTen then
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.XiangYaoDuoBao })
else
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit })
end

View File

@ -340,6 +340,9 @@ function UpView:RechargeType(_type)
JumpManager.GoJump(36008)
end
elseif _type == UpViewRechargeType.YeQiuQuan then--跳限时商市
if UIManager.IsOpen(UIName.TenRecruitPanel) then
UIManager.ClosePanel(UIName.TenRecruitPanel)
end
JumpManager.GoJump(40014)
elseif _type == UpViewRechargeType.HuaLingFu then--跳灵兽特惠
JumpManager.GoJump(40010)