diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua
index 3cd6d2fac9..a9c1a4b937 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua
@@ -79,7 +79,7 @@ function this:Refresh(func)
PopupTipPanel.ShowTip("御剑令不足,无法开始竞猜!")
return
end
- if configData.JoinCount - YuJianXingManager.joinCount <= 0 then
+ if 2 - #serverData <= 0 then
PopupTipPanel.ShowTip("竞猜次数不足,无法开始竞猜!")
return
end
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua
index cd84200950..3d66a03ae8 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua
@@ -41,17 +41,20 @@ function this:Refresh()
NetManager.RidingSwardInfoRequest(function ()
local data = ConfigManager.GetConfigData(ConfigName.RidingSwardResult,YuJianXingManager.lastResult.rankId).Result
for i = 1, 4 do
- local tempData = data[i][1]
- local go = self.preList[i]
- if not go then
- go = newObjToParent(self.SwordPre,self.grid)
- self.preList[i] = go
+ for j = 1, #data do
+ if i == data[j][1] then
+ local go = self.preList[i]
+ if not go then
+ go = newObjToParent(self.SwordPre,self.grid)
+ self.preList[i] = go
+ end
+ local rank = Util.GetGameObject(go,"Image"):GetComponent("Image")
+ local Img = go:GetComponent("Image")
+ rank.sprite = self.spLoader:LoadSprite(rankImg[i])
+ Img.sprite = self.spLoader:LoadSprite(SwordImg[j])
+ go:SetActive(true)
+ end
end
- local rank = Util.GetGameObject(go,"Image"):GetComponent("Image")
- local Img = go:GetComponent("Image")
- rank.sprite = self.spLoader:LoadSprite(rankImg[i])
- Img.sprite = self.spLoader:LoadSprite(SwordImg[tempData])
- go:SetActive(true)
end
self.roundTime.text = string.format("比赛场次: %s",TimeStampToDateStr4((YuJianXingManager.lastResult.rankTime)/1000))
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua
index 47c9482d26..731971e287 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua
@@ -6,10 +6,10 @@ local parent
local sortingOrder=0
local configData = ConfigManager.GetConfigData(ConfigName.RidingSwardConfig,1)
local SWARDNAMES = {
- [1] = "清风剑",
- [2] = "夏禹剑",
- [3] = "赤霄剑",
- [4] = "幻夜剑",
+ [1] = "【清风剑】",
+ [2] = "【夏禹剑】",
+ [3] = "【赤霄剑】",
+ [4] = "【幻夜剑】",
}
function this:InitComponent(gameObject)
@@ -77,8 +77,8 @@ function this:SingleDataShow(go,data)
btnGetText.text = "已领取"
btnGet:GetComponent("Button").interactable = false
end
- swardName.text = string.format("【%s】",SWARDNAMES[data.betSwardId])
- Result.text = data.result == 0 and "失败" or "获胜"
+ swardName.text = string.format("%s",SWARDNAMES[data.betSwardId])
+ Result.text = data.result == 0 and "失败" or "获胜"
ResultNum.text = data.costNum
ResultIcon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.JoinCost[1]))
betValue.text = configData.RateList[data.betSwardId]/10000