Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
70f553b732
File diff suppressed because it is too large
Load Diff
|
|
@ -139,7 +139,7 @@ function this:InitComponent()
|
|||
this.passBattle1 = Util.GetGameObject(self.transform, "bottom/passBattle1")
|
||||
|
||||
-- 上阵等级提示
|
||||
this.formTip = Util.GetGameObject(self.transform, "bottom/formTip")
|
||||
this.formTip = Util.GetGameObject(self.transform, "formTip")
|
||||
-- 上阵元素提示
|
||||
this.tip = Util.GetGameObject(self.transform, "bottom/tip")
|
||||
this.tip.gameObject:SetActive(false)
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ function this.GuildChallengeRequest(attackType,callBack)
|
|||
if callBack then
|
||||
callBack()
|
||||
end
|
||||
end, 6,true,true)
|
||||
end)
|
||||
CheckRedPointStatus(RedPointType.Guild_Transcript)
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ this.LoginWay = { Account = 0, WeChat = 1 }
|
|||
local ServerVersion = 1
|
||||
|
||||
local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin
|
||||
local IsDevelopLogin = false
|
||||
local IsDevelopLogin = true
|
||||
|
||||
local openIdkey = "openIdkey"
|
||||
local openIdPw = "openIdPw"
|
||||
|
|
|
|||
Loading…
Reference in New Issue