Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

ZhangBiao 2021-03-31 20:09:19 +08:00
commit 739eb8771c
10 changed files with 386 additions and 41 deletions

View File

@ -503,7 +503,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: 453, y: 148}
m_AnchoredPosition: {x: 393, y: 148}
m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1021994929
@ -1526,6 +1526,7 @@ RectTransform:
m_Children:
- {fileID: 8450296666935231207}
- {fileID: 375882601564511015}
- {fileID: 8691393323980831942}
m_Father: {fileID: 3944573084454140432}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1625,7 +1626,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &375882601564511015
RectTransform:
m_ObjectHideFlags: 0
@ -6261,7 +6262,7 @@ ParticleSystem:
--- !u!199 &8929290439668384673
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -11254,7 +11255,7 @@ ParticleSystem:
--- !u!199 &2614725686747898364
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -11707,6 +11708,83 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u63A2\u7D22\u5173\u5361\uFF1A"
LanguageIndex: 0
--- !u!1 &3442868041512323586
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8691393323980831942}
- component: {fileID: 5508367902803494906}
- component: {fileID: 4797373671291180919}
m_Layer: 0
m_Name: saoguang
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8691393323980831942
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3442868041512323586}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027}
m_LocalPosition: {x: 1.2, y: -1.6, z: -10}
m_LocalScale: {x: 97.68327, y: 36.6254, z: 0}
m_Children: []
m_Father: {fileID: 8508012917870958659}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0}
--- !u!33 &5508367902803494906
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3442868041512323586}
m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3}
--- !u!23 &4797373671291180919
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3442868041512323586}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 42ee0bcddf3721e4fa975bae69de7802, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &3531366508811625971
GameObject:
m_ObjectHideFlags: 0
@ -16874,7 +16952,7 @@ ParticleSystem:
--- !u!199 &8438194478903003875
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -17147,7 +17225,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: -399, y: -4}
m_AnchoredPosition: {x: -391, y: -4}
m_SizeDelta: {x: 65, y: 72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9189477452869038613
@ -22494,7 +22572,7 @@ ParticleSystem:
--- !u!199 &2825972370470481971
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -7082,7 +7082,7 @@ ParticleSystem:
--- !u!199 &1856602151176858527
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -12963,7 +12963,7 @@ ParticleSystem:
--- !u!199 &1472261994721625855
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -13744,6 +13744,83 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5884903768850113874
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5568954637454689846}
- component: {fileID: 4424783346964946505}
- component: {fileID: 4152234804141335421}
m_Layer: 0
m_Name: saoguang
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5568954637454689846
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5884903768850113874}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027}
m_LocalPosition: {x: -14.35, y: 9.56, z: -10}
m_LocalScale: {x: 66.8435, y: 27.35551, z: 0}
m_Children: []
m_Father: {fileID: 656871333459760029}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0}
--- !u!33 &4424783346964946505
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5884903768850113874}
m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3}
--- !u!23 &4152234804141335421
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5884903768850113874}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 42ee0bcddf3721e4fa975bae69de7802, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &5903157147032088429
GameObject:
m_ObjectHideFlags: 0
@ -14759,7 +14836,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4338198023154685773
RectTransform:
m_ObjectHideFlags: 0
@ -19395,7 +19472,7 @@ ParticleSystem:
--- !u!199 &374364804466542659
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24554,7 +24631,7 @@ ParticleSystem:
--- !u!199 &1107171649523788123
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24738,6 +24815,7 @@ RectTransform:
m_Children:
- {fileID: 720996062385666406}
- {fileID: 4338198023154685773}
- {fileID: 5568954637454689846}
m_Father: {fileID: 4121324987894023854}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -29980,7 +30058,7 @@ ParticleSystem:
--- !u!199 &8428054502987121459
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -160,6 +160,83 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u6BCF\u5929\u9996\u6B21\u5996\u6676\u3001\u85CF\u5B9D\u56FE\u5237\u65B0\u5FC5\u51FA\u6BCF\u5929\u9996\u6B21\u5996\u6676\u3001\u85CF\u5B9D\u56FE\u5237\u65B0\u5FC5\u51FA"
LanguageIndex: 0
--- !u!1 &1008985645962683869
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1521671391380629744}
- component: {fileID: 8578957074414086960}
- component: {fileID: 7367253204053300126}
m_Layer: 0
m_Name: saoguang
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1521671391380629744
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1008985645962683869}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027}
m_LocalPosition: {x: -14.22, y: 10.7, z: -10}
m_LocalScale: {x: 70.8541, y: 27.355509, z: 0}
m_Children: []
m_Father: {fileID: 3200006462700573122}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0}
--- !u!33 &8578957074414086960
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1008985645962683869}
m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3}
--- !u!23 &7367253204053300126
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1008985645962683869}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 42ee0bcddf3721e4fa975bae69de7802, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &2057937037334403154
GameObject:
m_ObjectHideFlags: 0
@ -177,7 +254,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5003044320972318133
RectTransform:
m_ObjectHideFlags: 0
@ -344,6 +421,7 @@ RectTransform:
m_Children:
- {fileID: 8073014250293766999}
- {fileID: 7872927186107349327}
- {fileID: 5451725095897758111}
m_Father: {fileID: 8943231972334443027}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -544,7 +622,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1317144675511236211
RectTransform:
m_ObjectHideFlags: 0
@ -5180,7 +5258,7 @@ ParticleSystem:
--- !u!199 &7136637659642796895
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10079,7 +10157,7 @@ ParticleSystem:
--- !u!199 &5948455514502789201
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10155,7 +10233,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7872927186107349327
RectTransform:
m_ObjectHideFlags: 0
@ -14791,7 +14869,7 @@ ParticleSystem:
--- !u!199 &8147078368002070576
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19592,7 +19670,7 @@ ParticleSystem:
--- !u!199 &5593093079576810994
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19707,7 +19785,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1369439104674480286
RectTransform:
m_ObjectHideFlags: 0
@ -19874,6 +19952,7 @@ RectTransform:
m_Children:
- {fileID: 8146944620792101845}
- {fileID: 1317144675511236211}
- {fileID: 1521671391380629744}
m_Father: {fileID: 6851284815492602951}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -20579,6 +20658,83 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u53BB\u6FC0\u6D3B"
LanguageIndex: 0
--- !u!1 &8528040598914995565
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5451725095897758111}
- component: {fileID: 2417897709015247622}
- component: {fileID: 7596891840400442835}
m_Layer: 0
m_Name: saoguang
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5451725095897758111
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8528040598914995565}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027}
m_LocalPosition: {x: -14.5, y: 10.8, z: -10}
m_LocalScale: {x: 70.18567, y: 27.355509, z: 0}
m_Children: []
m_Father: {fileID: 8962754582088625619}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0}
--- !u!33 &2417897709015247622
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8528040598914995565}
m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3}
--- !u!23 &7596891840400442835
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8528040598914995565}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 42ee0bcddf3721e4fa975bae69de7802, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &9207388326046412038
GameObject:
m_ObjectHideFlags: 0

View File

@ -15,9 +15,12 @@ local crystalItemId = StoreConfig[10015].Cost[1][1]
-- 当前妖晶的所需消耗
local crystalNeed = 0
--
local orginLayer = 0
--初始化组件(用于子类重写)
function FastExploreInfoPopup:InitComponent()
orginLayer = 0
this.imgFast = Util.GetGameObject(self.gameObject, "showMopUp/Bg/bg/title/title_fast")
this.imgStatic = Util.GetGameObject(self.gameObject, "showMopUp/Bg/bg/title/title_static")
@ -117,9 +120,7 @@ function this:OnShow()
end
end
--
local orginLayer = -1
function this:OnSortingOrderChange()
function FastExploreInfoPopup:OnSortingOrderChange()
Util.AddParticleSortLayer(this.privilegeEffect, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(this.effect, self.sortingOrder - orginLayer)
orginLayer = self.sortingOrder
@ -178,9 +179,9 @@ function this.RefreshItemNum()
this.effect:SetActive(not isActive)
this.privilegeEffect:SetActive(isActive)
if isActive then
this.privilegeContent.text = "<color=#FFA278>极速探索特权:<size=40>每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></size></color>"
this.privilegeContent.text = "<color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>"
else
this.privilegeContent.text = "极速探索特权:<size=40>每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></size>"
this.privilegeContent.text = "极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>"
end
if isActive then
local leftTime = PrivilegeManager.GetPrivilegeLeftTimeById(33)

View File

@ -692,6 +692,22 @@ function this.RefreshTriggerListen(id, openType, openArgs)
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
end
end
--gm 用
function this.AddFuncGuide(funcId)
if not funcId then return end
LogGreen(funcId.."funcId")
if not AppConst.isGuide then
LogGreen("不在引导内")
return
end
local guideId = GlobalSystemConfig[funcId].GuideId
-- if guideId and guideId ~= 0 then
-- table.insert(_FuncGuideList, guideId)
-- end
LogGreen("guideId:"..guideId)
GuideManager.ShowGuide(guideId)
end
return this

View File

@ -135,7 +135,7 @@ function this:InitComponent()
this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer7/btnTianShuMiJuan")
this.operateIcon = {
[FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50),
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -1100),
[FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200),
[FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1500),
[FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200),

View File

@ -4,7 +4,7 @@ local this = NotEnoughPopup
-- 跳转商店购买窗口物品id对应界面及参数
local _JumpConfig = {
[16] = 36010,
[16] = 36008,
--[15] = {36010},
--[16] = {36010},
}

View File

@ -76,7 +76,7 @@ function CumulativeSignInPage:BindEvent()
self.rewardPanel:GetComponent("RectTransform").localPosition = pos[i]
end)
else
Util.AddOnceClick(self.boxs[i],function()
Util.AddOnceClick(self.boxs[i].btnBox,function()
NetManager.GetActivityRewardRequest(data.mission[i].missionId, data.activityId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1)
self:RefreshBox()

View File

@ -153,7 +153,23 @@ function EveryDayGift:RefreshGiftData()
local callBack = function(index, item)
self:RefreshShowData(item, self.shopData[index],index)
end
local curindex = 0
self.scrollView:SetData(self.shopData, callBack)
for i = 1 ,#self.shopData do
if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then
for j = 1 , #DynamicActivityManager.selectIndex.goodsId do
if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then
curindex = i
break
end
end
end
if curindex ~= 0 then
break
end
end
LogGreen("curindex:"..curindex)
self.scrollView:SetIndex(curindex)
end
function EveryDayGift:isBought()

View File

@ -82,16 +82,6 @@ function GiftPre:InitComponent()
self.tip4_en = Util.GetGameObject(self.tipRoot,"tip4_en")
self.tip5 = Util.GetGameObject(self.tipRoot,"tip5")
self.tip5Text = Util.GetGameObject(self.tip5,"Text"):GetComponent("Text")
self.tipRoot:SetActive(false)
self.tip1:SetActive(false)
self.tip1_en:SetActive(false)
self.tip2:SetActive(false)
self.tip2_en:SetActive(false)
self.tip3:SetActive(false)
self.tip3_en:SetActive(false)
self.tip4:SetActive(false)
self.tip4_en:SetActive(false)
self.tip5:SetActive(false)
end
--绑定事件(用于子类重写)
@ -230,6 +220,16 @@ function GiftPre:SetContent1()
self.grid:GetComponent("RectTransform").anchoredPosition = offSetX[0].scroll
self.type1.gameObject:SetActive(false)
self.type2.gameObject:SetActive(false)
self.tipRoot:SetActive(false)
self.tip1:SetActive(false)
self.tip1_en:SetActive(false)
self.tip2:SetActive(false)
self.tip2_en:SetActive(false)
self.tip3:SetActive(false)
self.tip3_en:SetActive(false)
self.tip4:SetActive(false)
self.tip4_en:SetActive(false)
self.tip5:SetActive(false)
self.btnBuy:GetComponent("Image").sprite = Util.LoadSprite("s_slbz_1anniuhuangse")
if self.data.DataType == DataType.Direct and self.data.buyType == DirectBuyType.DAILY_GIFT then
self.type2.gameObject:SetActive(true)
@ -299,10 +299,10 @@ function GiftPre:SetTip()
end
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4003 then
self.tip5:SetActive(true)
self.tip5.text = "轩辕宝境必备特权每天增加2次免费次数6次额外购买次数"
self.tip5Text.text = "轩辕宝境必备特权每天增加2次免费次数6次额外购买次数"
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 7105 then
self.tip5:SetActive(true)
self.tip5.text = "每日可额外增加3次免费的灵兽山招募机会同时灵兽山妖晶招募价格变为8折!"
self.tip5Text.text = "每日可额外增加3次免费的灵兽山招募机会同时灵兽山妖晶招募价格变为8折!"
end
end