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

dev_chengFeng
jiaoyangna 2021-03-31 21:46:18 +08:00
commit 618e3a5014
6 changed files with 23 additions and 6 deletions

View File

@ -612,9 +612,9 @@ RectTransform:
m_Father: {fileID: 482684183697153721}
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: 449, y: 763}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -91, y: 763}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9085481190610419044

View File

@ -151,7 +151,7 @@ function DemonSlayerPanel:SetRank(ActInfo)
designation = allRankData[i].userTitle
}
npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData)
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-132.73,0),WALK_DIR.IDLE_LEFT)
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_LEFT)
else
image.enabled = true
item.text = Language[10423]

View File

@ -692,6 +692,22 @@ function this.RefreshTriggerListen(id, openType, openArgs)
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
end
end
--gm 用
function this.AddFuncGuide(funcId)
if not funcId then return end
LogGreen(funcId.."funcId")
if not AppConst.isGuide then
LogGreen("不在引导内")
return
end
local guideId = GlobalSystemConfig[funcId].GuideId
-- if guideId and guideId ~= 0 then
-- table.insert(_FuncGuideList, guideId)
-- end
LogGreen("guideId:"..guideId)
GuideManager.ShowGuide(guideId)
end
return this

View File

@ -135,7 +135,7 @@ function this:InitComponent()
this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer7/btnTianShuMiJuan")
this.operateIcon = {
[FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50),
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -1100),
[FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200),
[FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1500),
[FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200),

View File

@ -199,7 +199,7 @@ function this.SwitchView(index,isNotTop,isNotAni)
this.shaiBtn:SetActive(false)
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeroReturn})
this.bgIma.sprite=Util.LoadSprite(bgImageName[3])
this.title.sprite=Util.LoadSprite(titleImageName[4])
this.title.sprite=Util.LoadSprite(titleImageName[3])
end
this.title:SetNativeSize()

View File

@ -0,0 +1 @@
{"subChannel":"3000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_china/xq_b/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://106.52.122.168:8080/"}