【七界试炼】提交

dev_chengFeng
ZhangBiao 2021-09-23 19:23:27 +08:00
parent 170d4886e3
commit 5af10faa57
8 changed files with 2905 additions and 2726 deletions

View File

@ -6131,9 +6131,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1640, y: -909} m_AnchoredPosition: {x: 1640, y: -1029}
m_SizeDelta: {x: 860, y: 240} m_SizeDelta: {x: 860, y: 240}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3007151774743498339 --- !u!222 &3007151774743498339
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6157,8 +6157,8 @@ MonoBehaviour:
m_Padding: m_Padding:
m_Left: 0 m_Left: 0
m_Right: 0 m_Right: 0
m_Top: 20 m_Top: 0
m_Bottom: 20 m_Bottom: 0
m_ChildAlignment: 3 m_ChildAlignment: 3
m_StartCorner: 0 m_StartCorner: 0
m_StartAxis: 0 m_StartAxis: 0

View File

@ -1,85 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &395052110336182665
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7837319558304286115}
- component: {fileID: 2224304849929061418}
- component: {fileID: 1587157240035981223}
m_Layer: 0
m_Name: TextPre
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7837319558304286115
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 395052110336182665}
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: 5743257853158127750}
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: 225, y: -40}
m_SizeDelta: {x: 250, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2224304849929061418
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 395052110336182665}
m_CullTransparentMesh: 0
--- !u!114 &1587157240035981223
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 395052110336182665}
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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\xB7\u5168\u4F53\u795E\u5C06\u751F\u547D+3000"
LanguageIndex: 0
--- !u!1 &445942609768982801 --- !u!1 &445942609768982801
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -285,7 +205,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8191012020774304628} - {fileID: 8191012020774304628}
- {fileID: 5743257853158127750} - {fileID: 4469253690087178079}
m_Father: {fileID: 1828482313430278523} m_Father: {fileID: 1828482313430278523}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -877,6 +797,176 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_HorizontalFit: 0 m_HorizontalFit: 0
m_VerticalFit: 2 m_VerticalFit: 2
--- !u!1 &3135642949671645335
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4469253690087178079}
- component: {fileID: 6585703927883856743}
- component: {fileID: 6965158040882608152}
- component: {fileID: 4369420290039196202}
m_Layer: 5
m_Name: AddList
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4469253690087178079
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3135642949671645335}
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: 6714661470204780157}
m_Father: {fileID: 7442141385126438634}
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: 300, y: -145}
m_SizeDelta: {x: 550, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6585703927883856743
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3135642949671645335}
m_CullTransparentMesh: 0
--- !u!114 &6965158040882608152
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3135642949671645335}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: 100
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &4369420290039196202
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3135642949671645335}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 20
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!1 &3393813220120465767
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6714661470204780157}
- component: {fileID: 6919817761686733272}
- component: {fileID: 5505314840092843114}
m_Layer: 0
m_Name: TextPre
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6714661470204780157
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3393813220120465767}
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: 4469253690087178079}
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: 225, y: -40}
m_SizeDelta: {x: 550, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6919817761686733272
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3393813220120465767}
m_CullTransparentMesh: 0
--- !u!114 &5505314840092843114
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3393813220120465767}
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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\xB7\u5168\u4F53\u795E\u5C06\u751F\u547D+3000"
LanguageIndex: 0
--- !u!1 &3490801065415971355 --- !u!1 &3490801065415971355
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2608,97 +2698,6 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0 m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0 m_ChildControlWidth: 0
m_ChildControlHeight: 1 m_ChildControlHeight: 1
--- !u!1 &7670559230552919807
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5743257853158127750}
- component: {fileID: 7931651749744057525}
- component: {fileID: 5762230958227516854}
- component: {fileID: 1953130429167673892}
m_Layer: 5
m_Name: AddList
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5743257853158127750
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7670559230552919807}
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: 7837319558304286115}
m_Father: {fileID: 7442141385126438634}
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: 300, y: -145}
m_SizeDelta: {x: 550, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7931651749744057525
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7670559230552919807}
m_CullTransparentMesh: 0
--- !u!114 &5762230958227516854
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7670559230552919807}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: 100
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &1953130429167673892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7670559230552919807}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 100
m_Right: 0
m_Top: 0
m_Bottom: 20
m_ChildAlignment: 3
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 250, y: 30}
m_Spacing: {x: 30, y: 20}
m_Constraint: 1
m_ConstraintCount: 1
--- !u!1 &8039350172597770738 --- !u!1 &8039350172597770738
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -85,6 +85,8 @@ GameObject:
- component: {fileID: 787815193} - component: {fileID: 787815193}
- component: {fileID: 787815195} - component: {fileID: 787815195}
- component: {fileID: 345535409737851410} - component: {fileID: 345535409737851410}
- component: {fileID: 3282016280353546655}
- component: {fileID: 470471732384404232}
m_Layer: 5 m_Layer: 5
m_Name: propertyGrid m_Name: propertyGrid
m_TagString: Untagged m_TagString: Untagged
@ -147,6 +149,68 @@ MonoBehaviour:
m_Spacing: {x: 0, y: -3.67} m_Spacing: {x: 0, y: -3.67}
m_Constraint: 0 m_Constraint: 0
m_ConstraintCount: 2 m_ConstraintCount: 2
--- !u!114 &3282016280353546655
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 787815192}
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: 0
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: 0}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &470471732384404232
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 787815192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &981572256 --- !u!1 &981572256
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -1167,6 +1167,7 @@ QualityTextDef = {
[3] = "#76ABECFF",--蓝色 [3] = "#76ABECFF",--蓝色
[4] = "#B677DAFF",--紫色 [4] = "#B677DAFF",--紫色
[5] = "#F6934AFF",--橙色 [5] = "#F6934AFF",--橙色
[6] = "#E25B58FF",--红色
} }
-- 通用UI颜色色值 -- 通用UI颜色色值
UIColor = { UIColor = {

View File

@ -31,16 +31,16 @@ local QUALITY = {
--初始化组件(用于子类重写) --初始化组件(用于子类重写)
function QiJieTreasure:InitComponent(gameObject) function QiJieTreasure:InitComponent(gameObject)
self.spLoader = SpriteLoader.New() self.spLoader = SpriteLoader.New()
self.GameObject = Util.GetGameObject(gameObject,"Scroll") self.Scroll = Util.GetGameObject(gameObject,"Scroll")
self.itemPre = Util.GetGameObject(gameObject, "Pre") self.itemPre = Util.GetGameObject(gameObject, "Pre")
self.tabbox = Util.GetGameObject(gameObject, "tabbox") self.tabbox = Util.GetGameObject(gameObject, "tabbox")
self.goBtn = Util.GetGameObject(gameObject, "Button") self.goBtn = Util.GetGameObject(gameObject, "Button")
self.treasureNum = Util.GetGameObject(gameObject, "Num"):GetComponent("Text") self.treasureNum = Util.GetGameObject(gameObject, "Num"):GetComponent("Text")
local rootHight = self.GameObject.transform.rect.height local rootHight = self.Scroll.transform.rect.height
local width = self.GameObject.transform.rect.width local width = self.Scroll.transform.rect.width
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollFitterView, self.GameObject.transform, self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform,
self.itemPre, Vector2.New(width, rootHight), 1, 0) self.itemPre,nil, Vector2.New(width, rootHight), 1, 1,Vector2.New(0, 0))
self.ScrollView.moveTween.MomentumAmount = 1 self.ScrollView.moveTween.MomentumAmount = 1
self.ScrollView.moveTween.Strength = 2 self.ScrollView.moveTween.Strength = 2
self.ScrollView.elastic = false self.ScrollView.elastic = false
@ -71,8 +71,8 @@ end
function QiJieTreasure:OnShow(_parent,...) function QiJieTreasure:OnShow(_parent,...)
parent =_parent parent =_parent
sortingOrder = _parent.sortingOrder sortingOrder = _parent.sortingOrder
self.bool = false
self:SetTabBox() self:SetTabBox()
self:Refresh()
end end
function QiJieTreasure:SetTabBox() function QiJieTreasure:SetTabBox()
@ -85,7 +85,8 @@ function QiJieTreasure:SetTabBox()
end end
local OnTabChange = function (index) local OnTabChange = function (index)
self:Refresh(_TabData[index].quality) self.quality = _TabData[index].quality
self:Refresh()
end end
self.TabCtrl = TabBox.New() self.TabCtrl = TabBox.New()
@ -94,12 +95,13 @@ function QiJieTreasure:SetTabBox()
self.TabCtrl:Init(self.tabbox, _TabData) self.TabCtrl:Init(self.tabbox, _TabData)
end end
function QiJieTreasure:Refresh(_tabNum) function QiJieTreasure:Refresh()
self.dataList = QiJieShiLianManager.FormatTreasureData(_tabNum) self.dataList = QiJieShiLianManager.FormatTreasureData(self.quality)
self.treasureNum.text = string.format( "解锁遗物:%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList) self.treasureNum.text = string.format( "解锁遗物:%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList)
self.ScrollView:SetData(self.dataList, function(index, go) self.ScrollView:SetData(self.dataList, function(index, go)
self:SetSingleData(index,go,self.dataList[index]) self:SetSingleData(index,go,self.dataList[index])
end) end,self.bool,self.bool)
self.bool = true
end end
function QiJieTreasure:SetSingleData(index,_go,_data) function QiJieTreasure:SetSingleData(index,_go,_data)
@ -128,6 +130,7 @@ end
--界面关闭时调用(用于子类重写) --界面关闭时调用(用于子类重写)
function QiJieTreasure:OnClose() function QiJieTreasure:OnClose()
self.quality = 0
end end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)

View File

@ -39,11 +39,11 @@ local type = {
id = JumpServer_Type.QiJieShiLian, id = JumpServer_Type.QiJieShiLian,
funcId = FUNCTION_OPEN_TYPE.QIJIESHILIAN, funcId = FUNCTION_OPEN_TYPE.QIJIESHILIAN,
sort = 2, sort = 2,
bg = "q_qjsl_rikou_di", bg = "m_syjm_0026_png",
name = "q_qjsl_rikou_ysz", name = "q_qjsl_rikou_ysz",
live = "m_chsm_0035_png", live = "",
livePos = Vector2(274.5, -408.1), livePos = Vector2(0,0),
liveSize = Vector2(1612, 1802), liveSize = Vector2(0,0),
tipBg = "r_Dungeon_juqingdian", tipBg = "r_Dungeon_juqingdian",
resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[127].Value), resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[127].Value),
tip = "", tip = "",
@ -163,10 +163,12 @@ function JumpServerPanel:BtnClick(id)
if id == JumpServer_Type.HightLadder then if id == JumpServer_Type.HightLadder then
UIManager.OpenPanel(UIName.JumpServerHightLadderPanel) UIManager.OpenPanel(UIName.JumpServerHightLadderPanel)
self:ClosePanel()
end end
if id == JumpServer_Type.YuXuLunDao then if id == JumpServer_Type.YuXuLunDao then
UIManager.OpenPanel(UIName.WorldArenaMainPanel) UIManager.OpenPanel(UIName.WorldArenaMainPanel)
self:ClosePanel()
end end
if id == JumpServer_Type.QiJieShiLian then if id == JumpServer_Type.QiJieShiLian then
local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage) local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage)
@ -174,6 +176,7 @@ function JumpServerPanel:BtnClick(id)
QiJieShiLianManager.IsLock = false QiJieShiLianManager.IsLock = false
if qiejieConfig[msg.id] then if qiejieConfig[msg.id] then
UIManager.OpenPanel(UIName.QiJieShiLianPanel) UIManager.OpenPanel(UIName.QiJieShiLianPanel)
self:ClosePanel()
else else
LogError("七界试炼不存在该ID"..tostring(msg.id)) LogError("七界试炼不存在该ID"..tostring(msg.id))
PopupTipPanel.ShowTip("无法进入,请联系客服!") PopupTipPanel.ShowTip("无法进入,请联系客服!")

View File

@ -75,14 +75,14 @@ function this.ReceiveShopData(msg)
-- 更新事件 -- 更新事件
Game.GlobalEvent:DispatchEvent(GameEvent.Shop.OnShopInfoChange) Game.GlobalEvent:DispatchEvent(GameEvent.Shop.OnShopInfoChange)
for _, shopData in ipairs(this.allShopData) do -- for _, shopData in ipairs(this.allShopData) do
local name = ConfigManager.GetConfigDataByKey(ConfigName.StoreTypeConfig,"Id",shopData.id).Name -- local name = ConfigManager.GetConfigDataByKey(ConfigName.StoreTypeConfig,"Id",shopData.id).Name
Log("商店名称:"..tostring(name).."商店id:"..shopData.id.." 结束时间:"..tostring(TimeStampToDateStr(shopData.endTime/1000)).. -- Log("商店名称:"..tostring(name).."商店id:"..shopData.id.." 结束时间:"..tostring(TimeStampToDateStr(shopData.endTime/1000))..
" 上次刷新时间:"..tostring(TimeStampToDateStr(shopData.lastRefreshTime/1000))) -- " 上次刷新时间:"..tostring(TimeStampToDateStr(shopData.lastRefreshTime/1000)))
-- for _, v in ipairs(shopData.storeItem) do -- -- for _, v in ipairs(shopData.storeItem) do
-- Log("商品Id:"..v.id .." 购买次数:" .. v.buyNum) -- -- Log("商品Id:"..v.id .." 购买次数:" .. v.buyNum)
-- end -- -- end
end -- end
end end
-- 更新商店数据 -- 更新商店数据