公会车迟斗法修改
parent
b3b95119c0
commit
3782873283
|
@ -3851,7 +3851,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: -228.9, y: -181}
|
||||
m_AnchoredPosition: {x: 0, y: -181}
|
||||
m_SizeDelta: {x: 291, y: 82.82}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7092402890559883257
|
||||
|
@ -4552,7 +4552,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: 00ac1468e9435a541adf7d85d069b054, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 56e562f2e809ff74f93897fff77286b0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -4921,7 +4921,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 204, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7092402892274677875
|
||||
|
|
|
@ -1,5 +1,84 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &597779911571005168
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3957017510564291852}
|
||||
- component: {fileID: 4241313006670813248}
|
||||
- component: {fileID: 2334491062589374789}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3957017510564291852
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 597779911571005168}
|
||||
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: 4330446539217703807}
|
||||
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: -323, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4241313006670813248
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 597779911571005168}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2334491062589374789
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 597779911571005168}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 45
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u79EF\u5206\uFF1A"
|
||||
--- !u!1 &713138423185374048
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -34,7 +113,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.9, y: 613}
|
||||
m_AnchoredPosition: {x: 0, y: 613}
|
||||
m_SizeDelta: {x: 384.31, y: 64.41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8157581679687628173
|
||||
|
@ -78,7 +157,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6392\u884C\u5956\u52B1"
|
||||
m_Text: "\u79EF\u5206\u5956\u52B1"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &753510165589217599
|
||||
GameObject:
|
||||
|
@ -644,6 +723,7 @@ RectTransform:
|
|||
- {fileID: 1471586951478334148}
|
||||
- {fileID: 3421734083179396992}
|
||||
- {fileID: 1900260735345205632}
|
||||
- {fileID: 3957017510564291852}
|
||||
m_Father: {fileID: 9063173392937239258}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -1512,7 +1592,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6392 \u540D"
|
||||
m_Text: "\u79EF \u5206"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &4779308453069224781
|
||||
GameObject:
|
||||
|
@ -1769,7 +1849,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2892707779512085620
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1896,7 +1976,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3421734083179396992
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2343,6 +2423,85 @@ MonoBehaviour:
|
|||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &7393616006992037316
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3890559093366616860}
|
||||
- component: {fileID: 6690676133735524612}
|
||||
- component: {fileID: 8579872586725530053}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3890559093366616860
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7393616006992037316}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4581106361157655321}
|
||||
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: -323, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6690676133735524612
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7393616006992037316}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8579872586725530053
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7393616006992037316}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 45
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u79EF\u5206\uFF1A"
|
||||
--- !u!1 &8348350367174962818
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2373,6 +2532,7 @@ RectTransform:
|
|||
- {fileID: 4172396061084663737}
|
||||
- {fileID: 2892707779512085620}
|
||||
- {fileID: 5278002558142939069}
|
||||
- {fileID: 3890559093366616860}
|
||||
m_Father: {fileID: 9063173392937239258}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
@ -32,6 +32,7 @@ function GuildCarDelayMainPanel:InitComponent()
|
|||
this.BackBtn = Util.GetGameObject(self.gameObject, "BackBtn")
|
||||
this.rewardSortBtn = Util.GetGameObject(self.gameObject, "rewardSortBtn")
|
||||
this.lootRecordBtn = Util.GetGameObject(self.gameObject, "lootRecordBtn")
|
||||
this.lootRecordBtn:SetActive(false)
|
||||
this.HelpBtn = Util.GetGameObject(self.gameObject, "HelpBtn")
|
||||
this.helpPosition=this.HelpBtn:GetComponent("RectTransform").localPosition
|
||||
this.challengeBtn = Util.GetGameObject(self.gameObject, "challengeBtn")
|
||||
|
@ -42,7 +43,7 @@ function GuildCarDelayMainPanel:InitComponent()
|
|||
this.lootNum = Util.GetGameObject(self.gameObject, "lootBtn/num"):GetComponent("Text")
|
||||
this.lootCDTimeNum = Util.GetGameObject(self.gameObject, "lootBtn/timeNum/num"):GetComponent("Text")
|
||||
this.lootCDTimeNumGo = Util.GetGameObject(self.gameObject, "lootBtn/timeNum")
|
||||
|
||||
this.lootBtn:SetActive(false)
|
||||
this.tabBox = Util.GetGameObject(self.gameObject, "TabBox")
|
||||
this.TabCtrl = TabBox.New()
|
||||
|
||||
|
@ -207,19 +208,19 @@ function this.ShowTitleAllData()
|
|||
this.timeTextGo:SetActive(true)
|
||||
this.timeText2.text = Language[12289]
|
||||
--else
|
||||
elseif curProgress == -1 then
|
||||
elseif curProgress == -1 or curProgress == 2 or curProgress == 3 then
|
||||
timeText = Language[11016]
|
||||
this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.battleStartTime - GetTimeStamp(),timeText)
|
||||
--end
|
||||
elseif curProgress == 1 then
|
||||
timeText = Language[11017]
|
||||
this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.endTime - GetTimeStamp(),timeText)
|
||||
elseif curProgress == 2 then
|
||||
timeText = Language[11018]
|
||||
this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.grabStartTime - GetTimeStamp(),timeText)
|
||||
elseif curProgress == 3 then
|
||||
timeText = Language[11019]
|
||||
this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.endTime - GetTimeStamp(),timeText)
|
||||
-- elseif curProgress == 2 then
|
||||
-- timeText = Language[11018]
|
||||
-- this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.grabStartTime - GetTimeStamp(),timeText)
|
||||
-- elseif curProgress == 3 then
|
||||
-- timeText = Language[11019]
|
||||
-- this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.endTime - GetTimeStamp(),timeText)
|
||||
end
|
||||
if testLiveGO then
|
||||
GameObject.DestroyImmediate(testLiveGO)
|
||||
|
|
|
@ -125,22 +125,23 @@ function this.RefreshAllRedPoint()
|
|||
end
|
||||
--红点检测
|
||||
function this.RefreshRedPoint(progress)
|
||||
if progress ~= GuildCarDelayManager.progress then
|
||||
return false
|
||||
end
|
||||
if GuildCarDelayManager.progress == GuildCarDelayProType.Challenge then
|
||||
if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_CHALLENGE) > 0 and this.ChallengeCdTime <= 0 then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
elseif GuildCarDelayManager.progress == GuildCarDelayProType.Loot then
|
||||
if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT) > 0 and this.LootCdTime <= 0 then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
return false
|
||||
-- if progress ~= GuildCarDelayManager.progress then
|
||||
-- return false
|
||||
-- end
|
||||
-- if GuildCarDelayManager.progress == GuildCarDelayProType.Challenge then
|
||||
-- if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_CHALLENGE) > 0 and this.ChallengeCdTime <= 0 then
|
||||
-- return true
|
||||
-- else
|
||||
-- return false
|
||||
-- end
|
||||
-- elseif GuildCarDelayManager.progress == GuildCarDelayProType.Loot then
|
||||
-- if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT) > 0 and this.LootCdTime <= 0 then
|
||||
-- return true
|
||||
-- else
|
||||
-- return false
|
||||
-- end
|
||||
-- end
|
||||
end
|
||||
function this.SetCarPlayTimeData(time)
|
||||
if this.progress == GuildCarDelayProType.Challenge then
|
||||
|
|
|
@ -26,6 +26,7 @@ function GuildCarDelayRewardSortPopup:InitComponent()
|
|||
this.BackBtn = Util.GetGameObject(self.gameObject, "bg/btnBack")
|
||||
this.mySortNum = Util.GetGameObject(self.gameObject, "Record/SortNum")
|
||||
this.myDemons = Util.GetGameObject(self.gameObject, "Record/Demons")
|
||||
this.scoreTxt=Util.GetGameObject(self.gameObject, "Record/Text"):GetComponent("Text")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -69,38 +70,45 @@ function this.SwitchView(index)
|
|||
curIndex = index or curIndex
|
||||
this.ShowCurIndexRewardData()
|
||||
if curIndex == 2 then
|
||||
NetManager.RequestRankInfo(RANK_TYPE.GUILD_CAR_DELEAY_SINGLE, function(msg)
|
||||
this.SetRankDataShow(msg)
|
||||
--repeated UserRank ranks = 1;
|
||||
--optional RankInfo myRankInfo = 2;
|
||||
end)
|
||||
-- NetManager.RequestRankInfo(RANK_TYPE.GUILD_CAR_DELEAY_SINGLE, function(msg)
|
||||
-- this.SetRankDataShow(msg)
|
||||
-- end)
|
||||
RankingManager.InitData(RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,function()
|
||||
local ranks,myRankInfo = RankingManager.GetRankingInfo()
|
||||
this.SetRankDataShow(myRankInfo)
|
||||
end,nil,1)
|
||||
elseif curIndex == 1 then
|
||||
NetManager.RequestRankInfo(RANK_TYPE.GUILD_CAR_DELEAY_GUILD, function(msg)
|
||||
this.SetRankDataShow(msg)
|
||||
end)
|
||||
-- NetManager.RequestRankInfo(RANK_TYPE.GUILD_CAR_DELEAY_GUILD, function(msg)
|
||||
-- this.SetRankDataShow(msg)
|
||||
-- end)
|
||||
RankingManager.InitData(RANK_TYPE.GUILD_CAR_DELEAY_GUILD,function()
|
||||
local ranks,myRankInfo = RankingManager.GetRankingInfo()
|
||||
this.SetRankDataShow(myRankInfo)
|
||||
end,nil,1)
|
||||
end
|
||||
end
|
||||
function this.SetRankDataShow(msg)
|
||||
local sortNumTabs = {}
|
||||
for i = 1, 4 do
|
||||
sortNumTabs[i] = Util.GetGameObject(this.mySortNum, "SortNum ("..i..")")
|
||||
sortNumTabs[i]:SetActive(false)
|
||||
end
|
||||
if msg.myRankInfo.rank < 4 and msg.myRankInfo.rank > 0 then
|
||||
sortNumTabs[msg.myRankInfo.rank]:SetActive(true)
|
||||
else
|
||||
sortNumTabs[4]:SetActive(true)
|
||||
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = msg.myRankInfo.rank > 0 and msg.myRankInfo.rank or Language[10086]
|
||||
end
|
||||
-- local sortNumTabs = {}
|
||||
-- for i = 1, 4 do
|
||||
-- sortNumTabs[i] = Util.GetGameObject(this.mySortNum, "SortNum ("..i..")")
|
||||
-- sortNumTabs[i]:SetActive(false)
|
||||
-- end
|
||||
-- if msg.myRankInfo.rank < 4 and msg.myRankInfo.rank > 0 then
|
||||
-- sortNumTabs[msg.myRankInfo.rank]:SetActive(true)
|
||||
-- else
|
||||
-- sortNumTabs[4]:SetActive(true)
|
||||
-- Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = msg.myRankInfo.rank > 0 and msg.myRankInfo.rank or Language[10086]
|
||||
-- end
|
||||
local myrewardConfig = nil
|
||||
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.WorldBossRewardConfig)) do
|
||||
if configInfo.Type == curIndex and configInfo.BossId == GuildCarDelayManager.bossIndexId then
|
||||
table.insert(rewardList,configInfo)
|
||||
if not myrewardConfig and msg.myRankInfo.rank <= configInfo.Section[2] and msg.myRankInfo.rank >= configInfo.Section[1] then
|
||||
if not myrewardConfig and msg.param1>=configInfo.Score then
|
||||
myrewardConfig = configInfo
|
||||
end
|
||||
end
|
||||
end
|
||||
this.scoreTxt.text="积分:"..msg.param1
|
||||
if not myrewardConfig then
|
||||
myrewardConfig = rewardList[#rewardList]
|
||||
end
|
||||
|
@ -117,7 +125,7 @@ function this.SetRankDataShow(msg)
|
|||
end
|
||||
myDemonsItemList[i].gameObject:SetActive(true)
|
||||
end
|
||||
this.myDemons:SetActive(msg.myRankInfo.rank > 0)
|
||||
this.myDemons:SetActive(msg.param1 > 0)
|
||||
end
|
||||
--显示奖励
|
||||
function this.ShowCurIndexRewardData()
|
||||
|
@ -154,16 +162,17 @@ function this.SingleRewardDataShow(go,rewardConfig,index)
|
|||
sortNumTabs[i] = Util.GetGameObject(go, "SortNum/SortNum ("..i..")")
|
||||
sortNumTabs[i]:SetActive(false)
|
||||
end
|
||||
if index < 4 then
|
||||
sortNumTabs[rewardConfig.Section[1]]:SetActive(true)
|
||||
else
|
||||
sortNumTabs[4]:SetActive(true)
|
||||
local str = "+"
|
||||
if rewardConfig.Section[2] > 1 then
|
||||
str = "-"..rewardConfig.Section[2]
|
||||
end
|
||||
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rewardConfig.Section[1]..str
|
||||
end
|
||||
-- if index < 4 then
|
||||
-- sortNumTabs[rewardConfig.Section[1]]:SetActive(true)
|
||||
-- else
|
||||
-- sortNumTabs[4]:SetActive(true)
|
||||
-- local str = "+"
|
||||
-- if rewardConfig.Section[2] > 1 then
|
||||
-- str = "-"..rewardConfig.Section[2]
|
||||
-- end
|
||||
-- Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rewardConfig.Section[1]..str
|
||||
-- end
|
||||
Util.GetGameObject(go, "Text"):GetComponent("Text").text="积分:"..PrintWanNum2(rewardConfig.Score).."+"
|
||||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function GuildCarDelayRewardSortPopup:OnClose()
|
||||
|
|
|
@ -444,19 +444,20 @@ function this._TimeUpdate()
|
|||
this.timeText.text = string.format("挑战中")
|
||||
end
|
||||
else
|
||||
this.timeText.text = string.format("15点开始抢夺")
|
||||
end
|
||||
elseif GuildCarDelayManager.progress == GuildCarDelayProType.Loot then
|
||||
if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT) > 0 then
|
||||
timeDown = GuildCarDelayManager.LootCdTime
|
||||
if timeDown > 0 then
|
||||
this.timeText.text = string.format("%s后可抢夺",TimeToMorS(timeDown))
|
||||
else
|
||||
this.timeText.text = string.format("抢夺中")
|
||||
end
|
||||
else
|
||||
--this.timeText.text = string.format("15点开始抢夺")
|
||||
this.timeText.text = string.format("每日8点开启")
|
||||
end
|
||||
-- elseif GuildCarDelayManager.progress == GuildCarDelayProType.Loot then
|
||||
-- if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT) > 0 then
|
||||
-- timeDown = GuildCarDelayManager.LootCdTime
|
||||
-- if timeDown > 0 then
|
||||
-- this.timeText.text = string.format("%s后可抢夺",TimeToMorS(timeDown))
|
||||
-- else
|
||||
-- this.timeText.text = string.format("抢夺中")
|
||||
-- end
|
||||
-- else
|
||||
-- this.timeText.text = string.format("每日8点开启")
|
||||
-- end
|
||||
else
|
||||
this.timeText.text = string.format("每日8点开启")
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue