Merge remote-tracking branch 'origin/china/dev' into china/zf_test
commit
fb5b009ec8
|
@ -173,7 +173,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: -144, y: -629}
|
||||
m_AnchoredPosition: {x: -130.09, y: -501.3}
|
||||
m_SizeDelta: {x: 128, y: 128}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &230670704
|
||||
|
@ -14441,7 +14441,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: -131.659, y: -361.3}
|
||||
m_AnchoredPosition: {x: -120, y: -351}
|
||||
m_SizeDelta: {x: 123, y: 123}
|
||||
m_Pivot: {x: 0.5820729, y: 0.49999988}
|
||||
--- !u!222 &6711504830727681682
|
||||
|
@ -15297,8 +15297,8 @@ 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: -201, y: 93}
|
||||
m_SizeDelta: {x: 602, y: 590}
|
||||
m_AnchoredPosition: {x: -167.6, y: 93}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1537323617967077762
|
||||
CanvasRenderer:
|
||||
|
@ -15769,8 +15769,8 @@ 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: -25.6, y: -507.4}
|
||||
m_SizeDelta: {x: 602, y: 590}
|
||||
m_AnchoredPosition: {x: 7.8, y: -507.4}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7331428508582231755
|
||||
CanvasRenderer:
|
||||
|
@ -15813,8 +15813,8 @@ 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: -23.2, y: -1236.9}
|
||||
m_SizeDelta: {x: 602, y: 590}
|
||||
m_AnchoredPosition: {x: 7.8, y: -1236.9}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2463774609634762244
|
||||
CanvasRenderer:
|
||||
|
@ -15934,7 +15934,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: -144, y: -502}
|
||||
m_AnchoredPosition: {x: -130, y: 665.8}
|
||||
m_SizeDelta: {x: 130, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6195001280529825812
|
||||
|
@ -16220,6 +16220,114 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6661118793794881446
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 477848929825759101}
|
||||
- component: {fileID: 3627540526059406008}
|
||||
- component: {fileID: 2015387822721144830}
|
||||
- component: {fileID: 8633185699480616932}
|
||||
m_Layer: 5
|
||||
m_Name: Button
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &477848929825759101
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6661118793794881446}
|
||||
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: 330542457203313933}
|
||||
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: -8.9, y: -46.7}
|
||||
m_SizeDelta: {x: 559.8, y: 574.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3627540526059406008
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6661118793794881446}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2015387822721144830
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6661118793794881446}
|
||||
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: 1
|
||||
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: 8633185699480616932}
|
||||
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 &8633185699480616932
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6661118793794881446}
|
||||
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 &6739327895392724801
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -16353,7 +16461,6 @@ GameObject:
|
|||
- component: {fileID: 330542457203313933}
|
||||
- component: {fileID: 268591455508645806}
|
||||
- component: {fileID: 4002540956202477165}
|
||||
- component: {fileID: 4581009453381100790}
|
||||
m_Layer: 5
|
||||
m_Name: itemPre
|
||||
m_TagString: Untagged
|
||||
|
@ -16373,6 +16480,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 495726942628716100}
|
||||
- {fileID: 477848929825759101}
|
||||
m_Father: {fileID: 6871191882722429008}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -16403,7 +16511,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
@ -16418,48 +16526,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &4581009453381100790
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7413048951530282211}
|
||||
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: 1
|
||||
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: 4002540956202477165}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &7703627405567380423
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -16519,7 +16585,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
@ -16941,8 +17007,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 153.9, y: 95.20001}
|
||||
m_SizeDelta: {x: 602, y: 590}
|
||||
m_AnchoredPosition: {x: 187.3, y: 95.20001}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5499711229946069292
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -616,6 +616,9 @@ function MyGuildManager.BeKickOut(msg)
|
|||
ResetServerRedPointStatus(RedPointType.Guild_Apply)
|
||||
ResetServerRedPointStatus(RedPointType.Guild_Shop)
|
||||
ResetServerRedPointStatus(RedPointType.Shop_Guild_Check)
|
||||
Timer.New(function ()
|
||||
UIManager.OpenPanel(UIName.MainPanel)
|
||||
end,0.3):Start()
|
||||
else
|
||||
local rIndex = nil
|
||||
for index, mem in ipairs(this.MyGuildMemList) do
|
||||
|
|
|
@ -8,7 +8,7 @@ end
|
|||
local jumpDic = {
|
||||
[JumpType.Lottery] = function(data)--招募
|
||||
--local openPanle =
|
||||
local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"Sort",data.skipfactor[1],"FunType",JumpType.Lottery,"PageType",JumpType.Lottery)
|
||||
local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"Sort",data[1],"FunType",JumpType.Lottery,"PageType",JumpType.Lottery)
|
||||
UIManager.OpenPanel(UIName.RecruitMainPanel,config.ShopData[1][1])
|
||||
--if openPanle and data then
|
||||
-- openPanle.ShowGuideGo(data[1])
|
||||
|
|
|
@ -33,6 +33,7 @@ function ElementDrawCardPanelNew:InitComponent()
|
|||
self.itemPos[i].goImage.sprite = self.spLoader:LoadSprite(PropertyTypeImageBySiYuan[i].Image1)
|
||||
self.itemPos[i].PropertyImage = Util.GetGameObject(self.itemPos[i].go, "Image"):GetComponent("Image")
|
||||
self.itemPos[i].PropertyImage.sprite = self.spLoader:LoadSprite(PropertyTypeImageBySiYuan[i].image3)
|
||||
self.itemPos[i].btn = Util.GetGameObject(self.itemPos[i].go, "Button")
|
||||
end
|
||||
self.effect=Util.GetGameObject(self.transform, "effect")
|
||||
self.bgImage=Util.GetGameObject(self.transform, "bgImage")
|
||||
|
@ -87,7 +88,7 @@ function ElementDrawCardPanelNew:BindEvent()
|
|||
end)
|
||||
|
||||
for i = 1, #self.itemPos do
|
||||
Util.AddClick(self.itemPos[i].go, function()
|
||||
Util.AddClick(self.itemPos[i].btn, function()
|
||||
self.index = i
|
||||
RecruitManager.recruitSubIndex = i
|
||||
self:BtnAction(i)
|
||||
|
|
|
@ -360,23 +360,25 @@ function this:SetIndex()
|
|||
LOY = 2
|
||||
end
|
||||
local offSet = math.abs(this.itemList[i].index - 2)
|
||||
local isenter = true
|
||||
local localIsenter = true
|
||||
self.thread = coroutine.start(function()
|
||||
this.RemoveTrigger()
|
||||
while(offSet > 0) do
|
||||
if isenter then
|
||||
isenter = false
|
||||
this.mask:SetActive(true)
|
||||
if localIsenter then
|
||||
localIsenter = false
|
||||
this.MoveTo(LOY)
|
||||
coroutine.wait(0.25)
|
||||
offSet = offSet - 1
|
||||
this.SortItemList()
|
||||
isenter = true
|
||||
coroutine.wait(0.01)
|
||||
localIsenter = true
|
||||
end
|
||||
coroutine.wait(0.01)
|
||||
end
|
||||
this.mask:SetActive(false)
|
||||
end
|
||||
this:RefreshJianTou()
|
||||
this:PageOnChange(true)
|
||||
this.AddTrigger()
|
||||
this.mask:SetActive(false)
|
||||
end)
|
||||
end
|
||||
break
|
||||
|
@ -396,8 +398,8 @@ function this:PageOnChange(isShow)
|
|||
end
|
||||
end
|
||||
RecruitManager.CurRecruitId = self.CurRecruitId
|
||||
if subViewList[lastIndex] and subViewList[lastIndex].config and subViewList[lastIndex].sub then
|
||||
subViewList[lastIndex].sub:OnClose()
|
||||
for k,v in pairs(subViewList) do
|
||||
v.sub:OnClose()
|
||||
end
|
||||
if subViewList[self.curPage] and subViewList[self.curPage].config and subViewList[self.curPage].sub then
|
||||
subViewList[self.curPage].sub:OnShow(orginLayer)
|
||||
|
|
Loading…
Reference in New Issue