Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
e7da10a595
|
@ -13099,8 +13099,8 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3212244756701904239}
|
- component: {fileID: 3212244756701904239}
|
||||||
- component: {fileID: 7051047519548440414}
|
- component: {fileID: 7051047519548440414}
|
||||||
- component: {fileID: 4463008979964420397}
|
|
||||||
- component: {fileID: 1876896852746920017}
|
- component: {fileID: 1876896852746920017}
|
||||||
|
- component: {fileID: 6364469521312437198}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: xiaoyaoBtn
|
m_Name: xiaoyaoBtn
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -13122,6 +13122,7 @@ RectTransform:
|
||||||
- {fileID: 5921217385984459860}
|
- {fileID: 5921217385984459860}
|
||||||
- {fileID: 3816437666150209794}
|
- {fileID: 3816437666150209794}
|
||||||
- {fileID: 2075676431393585290}
|
- {fileID: 2075676431393585290}
|
||||||
|
- {fileID: 9075856861972713303}
|
||||||
m_Father: {fileID: 3847735914630897183}
|
m_Father: {fileID: 3847735914630897183}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 9
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -13138,35 +13139,6 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 6495467815025581066}
|
m_GameObject: {fileID: 6495467815025581066}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
--- !u!114 &4463008979964420397
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6495467815025581066}
|
|
||||||
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: 0}
|
|
||||||
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: adde8054810b2df47bc6ab95e01ccab7, 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 &1876896852746920017
|
--- !u!114 &1876896852746920017
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -13203,12 +13175,32 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 4463008979964420397}
|
m_TargetGraphic: {fileID: 0}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!114 &6364469521312437198
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6495467815025581066}
|
||||||
|
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 &6503000540594768807
|
--- !u!1 &6503000540594768807
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -13519,6 +13511,80 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &7173601102540005816
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 9075856861972713303}
|
||||||
|
- component: {fileID: 8011076288320213388}
|
||||||
|
- component: {fileID: 8299314090036111732}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: lock
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &9075856861972713303
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7173601102540005816}
|
||||||
|
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: 3212244756701904239}
|
||||||
|
m_RootOrder: 3
|
||||||
|
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: 12.42, y: -5.4}
|
||||||
|
m_SizeDelta: {x: 92, y: 52}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8011076288320213388
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7173601102540005816}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &8299314090036111732
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7173601102540005816}
|
||||||
|
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: 7481f1ebd61b03a49ba7fa41d24d8db1, 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!1 &7193894844801949144
|
--- !u!1 &7193894844801949144
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -69,7 +69,7 @@ function BattleAnalysisManager:OnAddRole(role)
|
||||||
data.info = role
|
data.info = role
|
||||||
end
|
end
|
||||||
function BattleAnalysisManager:OnAddMonster(monster)
|
function BattleAnalysisManager:OnAddMonster(monster)
|
||||||
if monster.uid==20100 then
|
if monster.position==100 or monster.uid==20100 then
|
||||||
monster.type=1
|
monster.type=1
|
||||||
end
|
end
|
||||||
local data = self:GetRecordData(monster)
|
local data = self:GetRecordData(monster)
|
||||||
|
|
|
@ -56,8 +56,11 @@ function LikeAbilityPanel:InitComponent()
|
||||||
|
|
||||||
--逍遥游入口
|
--逍遥游入口
|
||||||
self.btnXiaoYao=Util.GetGameObject(self.gameObject,"xiaoyaoBtn")
|
self.btnXiaoYao=Util.GetGameObject(self.gameObject,"xiaoyaoBtn")
|
||||||
self.btnXiaoYao:GetComponent("Image").sprite=self.spLoader:LoadSprite("x_xiaoyaoyou_daanniu_zh")
|
self.btnXiaoYaoLock=Util.GetGameObject(self.gameObject,"lock")
|
||||||
|
self.btnXiaoYaoIcon=Util.GetGameObject(self.gameObject,"Image")
|
||||||
|
self.btnXiaoYaoIcon:GetComponent("Image").sprite=self.spLoader:LoadSprite("x_xiaoyaoyou_daanniu_zh")
|
||||||
self.xiaoyaoRedPoint=Util.GetGameObject(self.btnXiaoYao,"redPoint")
|
self.xiaoyaoRedPoint=Util.GetGameObject(self.btnXiaoYao,"redPoint")
|
||||||
|
self.btnXiaoYaoTextPar = Util.GetGameObject(self.btnXiaoYao,"curValue")
|
||||||
self.btnXiaoYaoText = Util.GetGameObject(self.btnXiaoYao,"curValue/num"):GetComponent("Text")
|
self.btnXiaoYaoText = Util.GetGameObject(self.btnXiaoYao,"curValue/num"):GetComponent("Text")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -85,7 +88,12 @@ function LikeAbilityPanel:BindEvent()
|
||||||
end)
|
end)
|
||||||
--逍遥游
|
--逍遥游
|
||||||
Util.AddClick(self.btnXiaoYao,function()
|
Util.AddClick(self.btnXiaoYao,function()
|
||||||
XiaoYaoManager.OpenMapList()
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.XiaoYaoYou) then
|
||||||
|
XiaoYaoManager.OpenMapList()
|
||||||
|
else
|
||||||
|
local tip = ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.XiaoYaoYou)
|
||||||
|
PopupTipPanel.ShowTip(tip)
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
BindRedPointObject(RedPointType.XiaoYaoYouRedPoint, self.xiaoyaoRedPoint)
|
BindRedPointObject(RedPointType.XiaoYaoYouRedPoint, self.xiaoyaoRedPoint)
|
||||||
end
|
end
|
||||||
|
@ -122,6 +130,17 @@ function LikeAbilityPanel:OnShow()
|
||||||
Util.SetParticleSortLayer(self.effect1,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.effect1,self.sortingOrder + 1)
|
||||||
Util.SetParticleSortLayer(self.effect2,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.effect2,self.sortingOrder + 1)
|
||||||
Util.SetParticleSortLayer(self.effect3,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.effect3,self.sortingOrder + 1)
|
||||||
|
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.XiaoYaoYou) then
|
||||||
|
Util.SetGray(self.btnXiaoYaoIcon,true)
|
||||||
|
self.xiaoyaoRedPoint.gameObject:SetActive(false)
|
||||||
|
self.self.btnXiaoYaoTextPar.gameObject:SetActive(false)
|
||||||
|
self.btnXiaoYaoLock.gameObject:SetActive(true)
|
||||||
|
else
|
||||||
|
Util.SetGray(self.btnXiaoYaoIcon,false)
|
||||||
|
self.xiaoyaoRedPoint.gameObject:SetActive(true)
|
||||||
|
self.self.btnXiaoYaoTextPar.gameObject:SetActive(true)
|
||||||
|
self.btnXiaoYaoLock.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
self.btnXiaoYaoText.text=string.format("%d/%d",BagManager.GetItemCountById(UpViewRechargeType.YunYouVle),PrivilegeManager.GetPrivilegeNumber(39))
|
self.btnXiaoYaoText.text=string.format("%d/%d",BagManager.GetItemCountById(UpViewRechargeType.YunYouVle),PrivilegeManager.GetPrivilegeNumber(39))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue