【灵脉秘境】提交

dev_chengFeng
ZhangBiao 2021-11-19 17:48:56 +08:00
parent 95f71667fe
commit f1737b1c5d
4 changed files with 157 additions and 4 deletions

View File

@ -3950,6 +3950,143 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &4208926965389593698
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8105622087091877764}
- component: {fileID: 3663199440823953759}
- component: {fileID: 3814882258326252030}
- component: {fileID: 3120112176402561817}
- component: {fileID: 8137244929828027612}
m_Layer: 5
m_Name: storeBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8105622087091877764
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4208926965389593698}
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: 6199128604822066698}
m_RootOrder: 3
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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3663199440823953759
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4208926965389593698}
m_CullTransparentMesh: 0
--- !u!114 &3814882258326252030
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4208926965389593698}
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 &3120112176402561817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4208926965389593698}
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: 3814882258326252030}
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 &8137244929828027612
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4208926965389593698}
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 &4254517367175824050
GameObject:
m_ObjectHideFlags: 0
@ -6429,13 +6566,14 @@ RectTransform:
- {fileID: 1245326864826694941}
- {fileID: 8433727199722388493}
- {fileID: 6377394198622654848}
- {fileID: 8105622087091877764}
m_Father: {fileID: 1454780772259464311}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -100, y: -170}
m_SizeDelta: {x: 150, y: 450}
m_SizeDelta: {x: 150, y: 590.2}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &6993682086787095990
MonoBehaviour:

View File

@ -827,6 +827,7 @@ LINGMAISECRETRECORD_USERNAME_FIELD = protobuf.FieldDescriptor();
LINGMAISECRETRECORD_LINGMAIID_FIELD = protobuf.FieldDescriptor();
LINGMAISECRETRECORD_TIME_FIELD = protobuf.FieldDescriptor();
LINGMAISECRETRECORD_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD = protobuf.FieldDescriptor();
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
@ -8690,11 +8691,21 @@ LINGMAISECRETRECORD_PRACTICELEVEL_FIELD.default_value = 0
LINGMAISECRETRECORD_PRACTICELEVEL_FIELD.type = 5
LINGMAISECRETRECORD_PRACTICELEVEL_FIELD.cpp_type = 1
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.name = "defServerName"
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.full_name = ".rpc.protocols.LingMaiSecretRecord.defServerName"
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.number = 7
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.index = 6
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.label = 1
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.has_default_value = false
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.default_value = ""
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.type = 9
LINGMAISECRETRECORD_DEFSERVERNAME_FIELD.cpp_type = 9
LINGMAISECRETRECORD.name = "LingMaiSecretRecord"
LINGMAISECRETRECORD.full_name = ".rpc.protocols.LingMaiSecretRecord"
LINGMAISECRETRECORD.nested_types = {}
LINGMAISECRETRECORD.enum_types = {}
LINGMAISECRETRECORD.fields = {LINGMAISECRETRECORD_TYPE_FIELD, LINGMAISECRETRECORD_DEFNAME_FIELD, LINGMAISECRETRECORD_USERNAME_FIELD, LINGMAISECRETRECORD_LINGMAIID_FIELD, LINGMAISECRETRECORD_TIME_FIELD, LINGMAISECRETRECORD_PRACTICELEVEL_FIELD}
LINGMAISECRETRECORD.fields = {LINGMAISECRETRECORD_TYPE_FIELD, LINGMAISECRETRECORD_DEFNAME_FIELD, LINGMAISECRETRECORD_USERNAME_FIELD, LINGMAISECRETRECORD_LINGMAIID_FIELD, LINGMAISECRETRECORD_TIME_FIELD, LINGMAISECRETRECORD_PRACTICELEVEL_FIELD, LINGMAISECRETRECORD_DEFSERVERNAME_FIELD}
LINGMAISECRETRECORD.is_extendable = false
LINGMAISECRETRECORD.extensions = {}

View File

@ -54,9 +54,9 @@ function this:SetSingleData(_go,_data,_index)
time.text = string.format( "[%s]",TimeStampToDateStr5(_data.time))
if _data.type == 0 then
desc.text = string.format("经过一番激烈的战斗,最终击败%s,占领%s开始收集灵脉资源",PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
desc.text = string.format("经过一番激烈的战斗,最终击败%s %s,占领%s开始收集灵脉资源",tostring(_data.defServerName),PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
elseif _data.type == 1 then
desc.text = string.format("大战过后,我方神将不敌%s,丢失%s",PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
desc.text = string.format("大战过后,我方神将不敌%s %s,丢失%s",tostring(_data.defServerName),PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
end
end

View File

@ -49,6 +49,7 @@ function LingMaiMiJingPanel:InitComponent()
self.rewardBtn = Util.GetGameObject(self.rightBtns,"rewardBtn")
self.recordBtn = Util.GetGameObject(self.rightBtns,"recordBtn")
self.recordRed = Util.GetGameObject(self.recordBtn,"red")
self.storeBtn = Util.GetGameObject(self.rightBtns,"storeBtn")
--contentgrid
self.contentGrid = Util.GetGameObject(self.gameObject,"ContentGrid")
self.veinList = {}
@ -93,6 +94,9 @@ function LingMaiMiJingPanel:BindEvent()
Util.AddClick(self.jumpBtn,function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.LingMaiJump,#self.groupList/5)
end)
Util.AddClick(self.storeBtn,function()
JumpManager.GoJump(40044)
end)
end
--添加事件监听(用于子类重写)