diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index 0d86f16dd3..329c06ab38 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -2812,7 +2812,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &8505417738643154992
RectTransform:
m_ObjectHideFlags: 0
@@ -3686,7 +3686,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5458507908964693607
RectTransform:
m_ObjectHideFlags: 0
@@ -4690,7 +4690,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -289, y: -30}
- m_SizeDelta: {x: 0, y: 50}
+ m_SizeDelta: {x: 554, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6207184963520291164
CanvasRenderer:
@@ -6802,10 +6802,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 364, y: -25}
+ m_SizeDelta: {x: 64, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2623644575845027006
CanvasRenderer:
@@ -11508,10 +11508,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 421, y: -25}
+ m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4147448978121272876
CanvasRenderer:
@@ -14775,10 +14775,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 298, y: -25}
+ m_SizeDelta: {x: 68, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1634219095786722019
CanvasRenderer:
@@ -15118,10 +15118,10 @@ RectTransform:
m_Father: {fileID: 7011443766955100149}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 25, y: -25}
+ m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4775365495864396750
CanvasRenderer:
@@ -16146,7 +16146,7 @@ GameObject:
- component: {fileID: 5223189296591903394}
- component: {fileID: 257013618398066743}
m_Layer: 0
- m_Name: Num
+ m_Name: Icon1Num
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -16641,7 +16641,7 @@ GameObject:
- component: {fileID: 547228204539709605}
- component: {fileID: 1943508448131008586}
m_Layer: 0
- m_Name: Image
+ m_Name: Icon1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -19330,10 +19330,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 480, y: -25}
+ m_SizeDelta: {x: 68, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3001521279093352702
CanvasRenderer:
@@ -19992,10 +19992,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 534, y: -25}
+ m_SizeDelta: {x: 40, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6655447369566257867
CanvasRenderer:
@@ -25752,10 +25752,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 132, y: -25}
+ m_SizeDelta: {x: 144, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &290241255863644931
CanvasRenderer:
@@ -29595,10 +29595,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 30, y: -25}
+ m_SizeDelta: {x: 60, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3439840163256746747
CanvasRenderer:
@@ -44211,7 +44211,7 @@ GameObject:
- component: {fileID: 7818797715615655319}
- component: {fileID: 6127180182374345990}
m_Layer: 5
- m_Name: Image
+ m_Name: ResultImg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -45363,10 +45363,10 @@ RectTransform:
m_Father: {fileID: 7242633218266665757}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 50}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 234, y: -25}
+ m_SizeDelta: {x: 60, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6182734981002621230
CanvasRenderer:
diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
index d28b68b212..975c87b546 100644
--- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
+++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
@@ -516,5 +516,6 @@ GameEvent = {
YuJianXing = {
GameFinished = "YuJianXing.GameFinished",
UpdateRank = "YuJianXing.UpdateRank",
+ UpdateBetTime = "YuJianXing.UpdateBetTime",
},
}
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
index 2d1eb1aa41..6417d339d9 100644
--- a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
@@ -82,6 +82,7 @@ RIDINGSWARDINFORESPONSE = protobuf.Descriptor();
RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDINFORESPONSE_BETLIST_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDINFORESPONSE_LASTRANK_FIELD = protobuf.FieldDescriptor();
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor();
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
@@ -777,11 +778,21 @@ RIDINGSWARDINFORESPONSE_LASTRANK_FIELD.message_type = CommonProto_pb.RIDINGSWARD
RIDINGSWARDINFORESPONSE_LASTRANK_FIELD.type = 11
RIDINGSWARDINFORESPONSE_LASTRANK_FIELD.cpp_type = 10
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.name = "betCount"
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.full_name = ".rpc.protocols.RidingSwardInfoResponse.betCount"
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.number = 4
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.index = 3
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.label = 1
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.has_default_value = false
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.default_value = 0
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.type = 5
+RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD.cpp_type = 1
+
RIDINGSWARDINFORESPONSE.name = "RidingSwardInfoResponse"
RIDINGSWARDINFORESPONSE.full_name = ".rpc.protocols.RidingSwardInfoResponse"
RIDINGSWARDINFORESPONSE.nested_types = {}
RIDINGSWARDINFORESPONSE.enum_types = {}
-RIDINGSWARDINFORESPONSE.fields = {RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD, RIDINGSWARDINFORESPONSE_BETLIST_FIELD, RIDINGSWARDINFORESPONSE_LASTRANK_FIELD}
+RIDINGSWARDINFORESPONSE.fields = {RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD, RIDINGSWARDINFORESPONSE_BETLIST_FIELD, RIDINGSWARDINFORESPONSE_LASTRANK_FIELD, RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD}
RIDINGSWARDINFORESPONSE.is_extendable = false
RIDINGSWARDINFORESPONSE.extensions = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua
index 57c55a7e8f..4d352868a6 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet.lua
@@ -1,10 +1,10 @@
----- 御剑行竞猜 -----
local this = {}
local swordImg = {
- [1] = "y_yujianxing_banner04",
- [2] = "y_yujianxing_banner01",
- [3] = "y_yujianxing_banner02",
- [4] = "y_yujianxing_banner03",
+ [1] = "y_yujianxing_banner01",
+ [2] = "y_yujianxing_banner02",
+ [3] = "y_yujianxing_banner03",
+ [4] = "y_yujianxing_banner04",
}
local configData = ConfigManager.GetConfigData(ConfigName.RidingSwardConfig,1)
@@ -36,7 +36,7 @@ function this:OnShow(_parent)
self:Refresh()
end
-function this:Refresh()
+function this:Refresh(func)
NetManager.RidingSwardInfoRequest(function ()
local serverData = YuJianXingManager.curBetList
for i = 1, 4 do
@@ -53,6 +53,7 @@ function this:Refresh()
local num = Util.GetGameObject(go,"Cost/num"):GetComponent("Text")
local betNum = Util.GetGameObject(go,"Info/Text"):GetComponent("Text")
local btnBet = Util.GetGameObject(go,"btnBet")
+ local btnBetText = Util.GetGameObject(btnBet,"Text"):GetComponent("Text")
Img.sprite = self.spLoader:LoadSprite(swordImg[i])
selectImg:SetActive(false)
@@ -62,6 +63,7 @@ function this:Refresh()
betNum.text = string.format("赔率1:%s",(configData.RateList[i])/10000)
Util.SetGray(btnBet,false)
btnBet:GetComponent("Button").interactable = true
+ btnBetText.text = "竞 猜"
for j = 1, #serverData do
if serverData[j].swardId == i then
betNum.text = string.format("赔率1:%s",(configData.RateList[i])/10000)
@@ -69,17 +71,23 @@ function this:Refresh()
betImg.sprite = self.spLoader:LoadSprite("y_yujianxing_yijingcai")
Util.SetGray(btnBet,true)
btnBet:GetComponent("Button").interactable = false
+ btnBetText.text = "已竞猜"
end
end
Util.AddOnceClick(btnBet,function ()
NetManager.RidingSwardBetRequest(i,100,function ()
- self:Refresh()
+ self:Refresh(function ()
+ Game.GlobalEvent:DispatchEvent(GameEvent.YuJianXing.UpdateBetTime)
+ end)
end)
end)
end
self:SetTime()
self.itemNum.text = BagManager.GetTotalItemNum(configData.JoinCost[1])
self.itemImage.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.JoinCost[1]))
+ if func then
+ func()
+ end
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 731318ffdf..e644c0456a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -5921,19 +5921,18 @@ function this.RidingSwardActivityRequest(_activityId,func)
end
--御剑行请求领奖
-function this.RidingSwardRewardRequest(_time,func)
+function this.RidingSwardRewardRequest(_time,_swardId,func)
local data = ActivityProto_pb.RidingSwardRewardRequest()
data.time = _time
+ data.swardId = _swardId
local msg = data:SerializeToString()
- Network:SendMessageWithCallBack(MessageTypeProto_pb.RidingSwardRewardRequest , MessageTypeProto_pb.RidingSwardInfoResponse , msg, function(buffer)
+ Network:SendMessageWithCallBack(MessageTypeProto_pb.RidingSwardRewardRequest , MessageTypeProto_pb.RidingSwardRewardResponse , msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.RidingSwardInfoResponse()
msg:ParseFromString(data)
- YuJianXingManager.UpdataServerData(msg,function ()
- if func then
- func(msg)
- end
- end)
+ if func then
+ func(msg)
+ end
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua
index 41f0a28ea2..a638742a5a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua
@@ -4,9 +4,26 @@ local this = {}
local parent
--传入特效层级
local sortingOrder=0
+local configData = ConfigManager.GetConfigData(ConfigName.RidingSwardConfig,1)
+local swardName = {
+ [1] = "清风剑",
+ [1] = "清风剑",
+ [1] = "清风剑",
+ [1] = "清风剑",
+}
function this:InitComponent(gameObject)
- this.spLoader = SpriteLoader.New()
+ self.spLoader = SpriteLoader.New()
+ self.itemPre = Util.GetGameObject(gameObject,"itemPre")
+ self.itemPre:SetActive(false)
+ self.scrollItem = Util.GetGameObject(gameObject, "Scroll")
+ local rootHight = self.scrollItem.transform.rect.height
+ local width = self.scrollItem.transform.rect.width
+ self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform,
+ self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
+ self.ScrollView.moveTween.MomentumAmount = 1
+ self.ScrollView.moveTween.Strength = 2
+ self.ScrollView.elastic = false
end
function this:BindEvent()
@@ -18,7 +35,53 @@ end
function this:RemoveListener()
end
-function this:OnShow()
+function this:OnShow(_parent)
+ self.parent = _parent
+ self:Refresh(true,true)
+end
+
+function this:Refresh(_isTop,_isAnim)
+ NetManager.RidingSwardInfoRequest(function ()
+ local serverData = YuJianXingManager.curRecordList
+ self.ScrollView:SetData(serverData, function (index, go)
+ self:SingleDataShow(go, serverData[index])
+ end,not _isTop,not _isAnim)
+ end)
+end
+
+function this:SingleDataShow(go,data)
+ local resultImg = Util.GetGameObject(go,"ResultImg"):GetComponent("Image")
+ local roundNum = Util.GetGameObject(go,"RoundNum"):GetComponent("Text")
+ local Icon1 = Util.GetGameObject(go,"Icon1"):GetComponent("Image")
+ local Icon1Num = Util.GetGameObject(go,"Icon1Num"):GetComponent("Text")
+ local btnGet = Util.GetGameObject(go,"btnGet")
+ local btnGetText = Util.GetGameObject(btnGet,"Text"):GetComponent("Text")
+ local roundInfo = Util.GetGameObject(go,"RoundInfo")
+ local playerName = Util.GetGameObject(roundInfo,"Name"):GetComponent("Text")
+ local Result = Util.GetGameObject(roundInfo,"Result"):GetComponent("Text")
+ local ResultNum = Util.GetGameObject(roundInfo,"Num"):GetComponent("Text")
+ local ResultIcon = Util.GetGameObject(roundInfo,"Icon/Image"):GetComponent("Image")
+ local betValue = Util.GetGameObject(roundInfo,"Num2"):GetComponent("Text")
+
+ resultImg.sprite = self.spLoader:LoadSprite(data.result==0 and "r_playerrumble_bai_zh" or "r_playerrumble_sheng_zh")
+ roundNum.text = TimeStampToDateStr4(data.time/1000)
+ Icon1.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.JoinCost[1]))
+ Icon1Num.text = data.getNum
+ Util.SetGray(btnGet,false)
+ btnGet:GetComponent("Button").interactable = true
+ btnGetText.text = "领 取"
+ if data.state == 1 then
+ Util.SetGray(btnGet,true)
+ btnGetText.text = "已领取"
+ btnGet:GetComponent("Button").interactable = false
+ end
+ Util.AddOnceClick(btnGet,function ()
+ LogRed("data.time:"..tostring(data.time))
+ NetManager.RidingSwardRewardRequest(data.time,data.betSwardId,function (msg)
+ UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1)
+ self:Refresh(false,false)
+ end)
+ end)
end
function this:OnClose()
diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua
index 84651b912f..11079d9872 100644
--- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua
@@ -46,7 +46,7 @@ end
--更新服务器界面信息
function this.UpdataServerPanelData(msg,func)
- this.joinCount = msg.state--参与投注的轮数
+ this.joinCount = msg.betCount--参与投注的轮数
this.curState = msg.state--当前状态
if msg.state == 1 then
this.InWaiting = false
@@ -73,6 +73,7 @@ function this.UpdataServerData(msg,func)
this.curRecordList = msg.recordLsit
this.curBetList = {}
this.curBetList = msg.betList
+ this.joinCount = msg.betCount--参与投注的轮数
if func then
func()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua
index 74eb3bc3af..0cb7022458 100644
--- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua
@@ -73,11 +73,13 @@ end
--添加事件监听(用于子类重写)
function YuJianXingPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.YuJianXing.GameFinished, self.Refresh,self)
+ Game.GlobalEvent:AddEvent(GameEvent.YuJianXing.UpdateBetTime, self.SetBetTime,self)
end
--移除事件监听(用于子类重写)
function YuJianXingPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.YuJianXing.GameFinished, self.Refresh,self)
+ Game.GlobalEvent:RemoveEvent(GameEvent.YuJianXing.UpdateBetTime, self.SetBetTime,self)
end
function YuJianXingPanel:OnSortingOrderChange()
@@ -100,10 +102,14 @@ end
function YuJianXingPanel:Refresh()
YuJianXingManager.HideAllPlayers(not YuJianXingManager.InWaiting)
self.waiting:SetActive(YuJianXingManager.InWaiting)
- self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - 1)
--为小人在地图上下移动做处理
self.count = 0
self:SetTime()
+ self:SetBetTime()
+end
+
+function YuJianXingPanel:SetBetTime()
+ self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount)
end
--比赛开始动画