Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
commit
01bddcc8e3
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 156cef414ae4fbb4bb62f5146cba45ff
|
||||
guid: a1f0343ec18f4de49af341eebf4094c7
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 9fb94a96233ac8345bfc62a0a6efdcf8
|
||||
spriteID: df032f5d0c4338943bc2de53cf3e45c2
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8e943e46d79921e4aa0a44534a28de82
|
||||
guid: bc3a3c45bcc0c5d409e676da49c724cf
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 987693c75f722244ca6a66f46c440732
|
||||
spriteID: 76b796c3819b65e40a633ebbe069dd38
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a632c506b4d739e439b78f8130a4e961
|
||||
guid: a2e00acf957d8e940882d3eb577fd06c
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 635b3e6cd773a8f438e5ef9563f4baa7
|
||||
spriteID: bdbaa942051a6af40b66334e2b457e96
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
@ -114,10 +114,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6511771316027140810}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 595, y: -45}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &103057047
|
||||
CanvasRenderer:
|
||||
|
|
@ -4744,10 +4744,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6511771316027140810}
|
||||
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: 75, y: -45}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4333355844115441707
|
||||
CanvasRenderer:
|
||||
|
|
@ -7080,7 +7080,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -410}
|
||||
m_SizeDelta: {x: 800, y: 90}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5992374240210674179
|
||||
CanvasRenderer:
|
||||
|
|
@ -16508,10 +16508,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6511771316027140810}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 465, y: -45}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1573551743946025575
|
||||
CanvasRenderer:
|
||||
|
|
@ -20056,10 +20056,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6511771316027140810}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 335, y: -45}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4934918169303577311
|
||||
CanvasRenderer:
|
||||
|
|
@ -22199,10 +22199,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6511771316027140810}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 205, y: -45}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5684472203954849967
|
||||
CanvasRenderer:
|
||||
|
|
@ -23924,10 +23924,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6511771316027140810}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 725, y: -45}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6724403881698098274
|
||||
CanvasRenderer:
|
||||
|
|
@ -23957,7 +23957,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: a3e447e3c672481499e9acc09eac9093, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: bec24c2d2c079154a8b00f168fdab428, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -31431,7 +31431,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3828362588263756447
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -47903,7 +47903,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 8e943e46d79921e4aa0a44534a28de82, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: bc3a3c45bcc0c5d409e676da49c724cf, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -48703,7 +48703,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: a632c506b4d739e439b78f8130a4e961, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: a2e00acf957d8e940882d3eb577fd06c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ function XunBaoMiZongMap:OnShow()
|
|||
cantWalk = true
|
||||
self.btnGet.gameObject:GetComponent("Button").interactable = true
|
||||
self.btnBack.gameObject:GetComponent("Button").interactable = true
|
||||
self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu01")
|
||||
self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu01_zh")
|
||||
self.effectBtnGet:SetActive(false)
|
||||
self.liveNode = PlayerLiveView:New(self.roleRoot, 1, nil, nil, nil, true)
|
||||
self.liveNode:OnOpen(300, Vector3.zero, WALK_DIR.IDLE_FRONT)
|
||||
|
|
@ -242,12 +242,12 @@ function XunBaoMiZongMap:DoCheckDistance()
|
|||
SoundManager.PlaySound("Audio_linglongbaojing_kaiqi_002", false)
|
||||
inside = true
|
||||
end
|
||||
self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu")
|
||||
self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu_zh")
|
||||
self.liveNode:SetSelfDirectingTag(false)
|
||||
self.effectBtnGet:SetActive(true)
|
||||
else
|
||||
inside = false
|
||||
self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu01")
|
||||
self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu01_zh")
|
||||
self.liveNode:SetSelfDirectingTag(true, self.liveNode.leader.transform.localPosition, self.rewardPos)
|
||||
self.effectBtnGet:SetActive(false)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue