Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-04-12 18:10:43 +08:00
commit 867bcc62db
3 changed files with 83 additions and 7 deletions

View File

@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &168858978 --- !u!224 &168858978
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -112,12 +112,13 @@ RectTransform:
m_Children: m_Children:
- {fileID: 721677133} - {fileID: 721677133}
- {fileID: 168858978} - {fileID: 168858978}
- {fileID: 5821898650707180699}
m_Father: {fileID: 1066462918} m_Father: {fileID: 1066462918}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -150, y: -342.25} m_AnchoredPosition: {x: 390, y: -342.25}
m_SizeDelta: {x: 200, y: 200} m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &272688417 --- !u!222 &272688417
@ -8666,6 +8667,80 @@ MonoBehaviour:
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 9999 m_Text: 9999
LanguageIndex: 0 LanguageIndex: 0
--- !u!1 &4660483806640443395
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5821898650707180699}
- component: {fileID: 817264819269327076}
- component: {fileID: 7741716037982142121}
m_Layer: 5
m_Name: Num
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5821898650707180699
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4660483806640443395}
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: 272688413}
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: 0, y: 9.1}
m_SizeDelta: {x: 80, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &817264819269327076
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4660483806640443395}
m_CullTransparentMesh: 0
--- !u!114 &7741716037982142121
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4660483806640443395}
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 &4664533075800293046 --- !u!1 &4664533075800293046
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -18090,7 +18165,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Start m_Text: "\u5F00\u59CB"
--- !u!1 &8756207589237757590 --- !u!1 &8756207589237757590
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -562,7 +562,7 @@ function this.UpdateHeroDatas(_msgHeroData)
local soulPrintList = {} local soulPrintList = {}
for i,v in ipairs(_msgHeroData.soulPos) do for i,v in ipairs(_msgHeroData.soulPos) do
local soulPrint = { equipId = v.equipId, position = v.position} local soulPrint = { equipId = v.equipId, position = v.position}
SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId) -- SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId)
table.insert(soulPrintList, soulPrint) table.insert(soulPrintList, soulPrint)
end end
heroData.soulPrintList= soulPrintList heroData.soulPrintList= soulPrintList

View File

@ -30,18 +30,19 @@ function this.Show()
_itemsList[index] = newObjToParent(this.itemPre, this.itemsLayout) _itemsList[index] = newObjToParent(this.itemPre, this.itemsLayout)
end end
_itemsList[index]:GetComponent("Button").interactable = false _itemsList[index]:GetComponent("Button").interactable = false
local Num = Util.GetGameObject(_itemsList[index], "Text"):GetComponent("Text") local Num = Util.GetGameObject(_itemsList[index], "Num"):GetComponent("Image")
local kuang = Util.GetGameObject(_itemsList[index], "kuang") local kuang = Util.GetGameObject(_itemsList[index], "kuang")
_itemsList[index]:SetActive(true) _itemsList[index]:SetActive(true)
Num.text = tonumber(num)
if num == "?" then if num == "?" then
_itemsList[index]:GetComponent("Button").interactable = true _itemsList[index]:GetComponent("Button").interactable = true
Util.AddOnceClick(_itemsList[index], function() Util.AddOnceClick(_itemsList[index], function()
this.ChooseAnswer(index) this.ChooseAnswer(index)
end) end)
kuang:SetActive(false) kuang:SetActive(false)
Num.text = " " Num.sprite = Util.LoadSprite("r_gonghui_pipeiwenhao")
else
Num.sprite = Util.LoadSprite("r_fxgz_shuzi_"..tonumber(num))
end end
end end
end end