Merge branch 'china/dev-c' into 0功能/修行玩法

dev_chengFeng
ZhangBiao 2021-05-19 20:53:37 +08:00
commit 2870091514
5 changed files with 86 additions and 99 deletions

View File

@ -25144,99 +25144,6 @@ RectTransform:
m_AnchoredPosition: {x: 2, y: 30}
m_SizeDelta: {x: 115, y: 115}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3621427217120719988
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8749010776231528344}
- component: {fileID: 6954164627369043282}
- component: {fileID: 6440320373301353969}
- component: {fileID: 8645828430362796465}
m_Layer: 5
m_Name: price
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8749010776231528344
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3621427217120719988}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_Children: []
m_Father: {fileID: 8117553058189776102}
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: -270, y: -59}
m_SizeDelta: {x: 331, y: 94}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6954164627369043282
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3621427217120719988}
m_CullTransparentMesh: 0
--- !u!114 &6440320373301353969
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3621427217120719988}
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: 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: 64e11c7b076fb1148ae80198b1f08a26, type: 2}
m_FontSize: 0
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 1500
--- !u!114 &8645828430362796465
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3621427217120719988}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
m_Name:
m_EditorClassIdentifier:
_textSpacing: -26
--- !u!1 &3773357416568256862
GameObject:
m_ObjectHideFlags: 0
@ -35901,7 +35808,7 @@ RectTransform:
m_Children:
- {fileID: 978798360068177927}
- {fileID: 6110441295351326952}
- {fileID: 8749010776231528344}
- {fileID: 9102664734100925182}
- {fileID: 4166021710258492366}
- {fileID: 3113019854117316961}
m_Father: {fileID: 8640507796650688639}
@ -36708,6 +36615,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u7B2C\u4E00\u5929"
LanguageIndex: 0
--- !u!1 &7965344515937702064
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9102664734100925182}
- component: {fileID: 4254234701224182570}
- component: {fileID: 6513731325701252553}
m_Layer: 5
m_Name: price
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9102664734100925182
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7965344515937702064}
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: 8117553058189776102}
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: -106.25, y: -59}
m_SizeDelta: {x: 249.5, y: 84}
m_Pivot: {x: 0.50000006, y: 0.5}
--- !u!222 &4254234701224182570
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7965344515937702064}
m_CullTransparentMesh: 0
--- !u!114 &6513731325701252553
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7965344515937702064}
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: 0}
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 &8182992537569118298
GameObject:
m_ObjectHideFlags: 0

View File

@ -2082,6 +2082,7 @@ FacePanelType = {
MainLevel = 10,--主线限时礼包
TimeLimitSkin = 11,--限时神装礼包
FuXingGaoZhao = 12,--福星高照活动
Pokemon = 13,--灵兽推送礼包
}
--迷宫寻宝条件类型
FindTreasureNeedType = {

View File

@ -132,7 +132,8 @@ function PatFacePanel:OnShowPatFaceData()
self.obg6:SetActive(patFaceSingleData.Type == FacePanelType.FindFairy)
self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac or
patFaceSingleData.Type == FacePanelType.MonsterWave or
patFaceSingleData.Type == FacePanelType.MainLevel)
patFaceSingleData.Type == FacePanelType.MainLevel or
patFaceSingleData.Type == FacePanelType.Pokemon)
self.obg8:SetActive(patFaceSingleData.Type == FacePanelType.TimeLimitSkin)
self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao)
if patFaceSingleData.Type == FacePanelType.Sbtj then
@ -152,7 +153,8 @@ function PatFacePanel:OnShowPatFaceData()
self:OnShowOb6Data()
elseif patFaceSingleData.Type == FacePanelType.UpgradePac or
patFaceSingleData.Type == FacePanelType.MonsterWave or
patFaceSingleData.Type == FacePanelType.MainLevel then
patFaceSingleData.Type == FacePanelType.MainLevel or
patFaceSingleData.Type == FacePanelType.Pokemon then
self:OnShowOb7Data(patFaceSingleData.Type)
elseif patFaceSingleData.Type == FacePanelType.TimeLimitSkin then
self:OnShowOb8Data()
@ -349,6 +351,8 @@ function PatFacePanel:OnShowOb7Data(Type)
OperatingManager.upGradePackagePanelType = 4
elseif Type == FacePanelType.MainLevel then
OperatingManager.upGradePackagePanelType = 3
elseif Type == FacePanelType.Pokemon then
OperatingManager.upGradePackagePanelType = 5
end
UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end)
end

View File

@ -32,6 +32,7 @@ function this:InitComponent()
self.buttonIcon.transform.localPosition = Vector3.zero
self.buttonIcon.transform.localScale = Vector3.one
self.buttonIcon.transform:SetAsFirstSibling()
self.buttonIcon:SetActive(true)
self.hand = Util.GetGameObject (self.buttonIcon, "GameObject")
@ -621,7 +622,6 @@ function this:PlayFoucsAnim(targetPos)
if GuideConfig[this.id].Position then
this.dialogRoot:SetActive(true)
end
if self.tween then
self.tween:Kill()
end

View File

@ -18,8 +18,9 @@ local rechargeData
local activityType = {
[1] = {name = Language[11935],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21},
[2] = {name = Language[11936],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8},
[3] = {name = Language[11935],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25},
[4] = {name = Language[11935],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26},
[3] = {name = "关卡推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25},
[4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26},
[5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31},
}
--初始化组件(用于子类重写)
function this:InitComponent()