Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
7ed3549506
|
|
@ -4812,7 +4812,7 @@ MonoBehaviour:
|
|||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1288297354386789918}
|
||||
m_TextComponent: {fileID: 1288297354386789918}
|
||||
m_Placeholder: {fileID: 0}
|
||||
m_Placeholder: {fileID: 3293787382343120790}
|
||||
m_ContentType: 0
|
||||
m_InputType: 0
|
||||
m_AsteriskChar: 42
|
||||
|
|
|
|||
|
|
@ -1540,7 +1540,7 @@ RectTransform:
|
|||
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: 1.9998016, y: 22.000002}
|
||||
m_AnchoredPosition: {x: 1.9998016, y: 11.999023}
|
||||
m_SizeDelta: {x: 265.87, y: 128.64}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222127981596146426
|
||||
|
|
@ -1679,7 +1679,7 @@ RectTransform:
|
|||
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: -194, y: 22.00097}
|
||||
m_AnchoredPosition: {x: -194, y: 12}
|
||||
m_SizeDelta: {x: 265.87, y: 128.64}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222489949350275454
|
||||
|
|
@ -2268,7 +2268,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 796, y: 97.725}
|
||||
m_SizeDelta: {x: 796, y: 127}
|
||||
m_Pivot: {x: 0.4225862, y: 0.17486048}
|
||||
--- !u!1 &1332321718721906
|
||||
GameObject:
|
||||
|
|
@ -3807,7 +3807,7 @@ RectTransform:
|
|||
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: 6, y: 22.000002}
|
||||
m_AnchoredPosition: {x: 6, y: 8.999001}
|
||||
m_SizeDelta: {x: 265.87, y: 128.64}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222639004779027372
|
||||
|
|
@ -4023,7 +4023,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 398, y: -35.249027}
|
||||
m_AnchoredPosition: {x: 398, y: -45.250008}
|
||||
m_SizeDelta: {x: 160, y: 35.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222583352632964838
|
||||
|
|
@ -4316,7 +4316,7 @@ RectTransform:
|
|||
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: 2, y: 22.000002}
|
||||
m_AnchoredPosition: {x: 2, y: 11.999023}
|
||||
m_SizeDelta: {x: 265.87, y: 128.64}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222722682876742258
|
||||
|
|
@ -6133,7 +6133,7 @@ RectTransform:
|
|||
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: -194, y: 22.00097}
|
||||
m_AnchoredPosition: {x: -194, y: 9}
|
||||
m_SizeDelta: {x: 265.87, y: 128.64}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5280409515082408684
|
||||
|
|
@ -7031,7 +7031,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 257.28998, y: -22.253325}
|
||||
m_AnchoredPosition: {x: 257.28998, y: -22.253326}
|
||||
m_SizeDelta: {x: 540, y: 30}
|
||||
m_Pivot: {x: 0.44683328, y: 0.35822254}
|
||||
--- !u!222 &5279464545680109242
|
||||
|
|
@ -10821,7 +10821,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 796, y: 97.725}
|
||||
m_SizeDelta: {x: 796, y: 127}
|
||||
m_Pivot: {x: 0.4225862, y: 0.17486048}
|
||||
--- !u!1 &5356915432497729598
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
local minute = math.floor(second / 60) % 60
|
||||
local sec = math.floor(second % 60)
|
||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
local timeStr = string.format("%s时%s分%s秒", hour, minute, sec)
|
||||
local timeStr = string.format("%s分%s秒", minute, sec)
|
||||
PopupTipPanel.ShowTip(string.format("%s后才可再次使用此功能!",timeStr))
|
||||
end
|
||||
end)
|
||||
|
|
@ -502,7 +502,7 @@ function this.TimeStampToDateString(second)
|
|||
local minute = math.floor(second / 60) % 60
|
||||
local sec = math.floor( second % 60)
|
||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
return string.format("(%s:%s:后失效)", minute, sec)
|
||||
return string.format("(%s:%s:%s:后失效)",hour, minute, sec)
|
||||
end
|
||||
|
||||
function this.SetSelectImagePos(parent)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ this.LoginWay = { Account = 0, WeChat = 1 }
|
|||
local ServerVersion = 1
|
||||
|
||||
local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin
|
||||
local IsDevelopLogin = true
|
||||
local IsDevelopLogin = false
|
||||
|
||||
local openIdkey = "openIdkey"
|
||||
local openIdPw = "openIdPw"
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.CumulativeSignIn,OperatingManager.GetSignInRedPointStatus)
|
||||
--月卡
|
||||
--(24暂时关闭)放开这里就行
|
||||
-- RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint)
|
||||
--连续充值
|
||||
RPData:AddCheckFunc(RedPointType.ContinuityRecharge,ActivityGiftManager.GetContinuityRechargeRedPoint)
|
||||
-- 头像红点
|
||||
|
|
|
|||
Loading…
Reference in New Issue