diff --git a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua index f77193d9e4..2d1eb1aa41 100644 --- a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua @@ -68,6 +68,7 @@ RIDINGSWARDACTIVITYRESPONSE_STATE_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDACTIVITYRESPONSE_TIME_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDACTIVITYRESPONSE_MODELINFO_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD = protobuf.FieldDescriptor(); +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDINFOREQUEST = protobuf.Descriptor(); RIDINGSWARDREWARDREQUEST = protobuf.Descriptor(); RIDINGSWARDREWARDREQUEST_TIME_FIELD = protobuf.FieldDescriptor(); @@ -647,11 +648,21 @@ RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD.default_value = 0 RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD.type = 5 RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD.cpp_type = 1 +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.name = "betCount" +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.full_name = ".rpc.protocols.RidingSwardActivityResponse.betCount" +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.number = 5 +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.index = 4 +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.label = 1 +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.has_default_value = false +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.default_value = 0 +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.type = 5 +RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD.cpp_type = 1 + RIDINGSWARDACTIVITYRESPONSE.name = "RidingSwardActivityResponse" RIDINGSWARDACTIVITYRESPONSE.full_name = ".rpc.protocols.RidingSwardActivityResponse" RIDINGSWARDACTIVITYRESPONSE.nested_types = {} RIDINGSWARDACTIVITYRESPONSE.enum_types = {} -RIDINGSWARDACTIVITYRESPONSE.fields = {RIDINGSWARDACTIVITYRESPONSE_STATE_FIELD, RIDINGSWARDACTIVITYRESPONSE_TIME_FIELD, RIDINGSWARDACTIVITYRESPONSE_MODELINFO_FIELD, RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD} +RIDINGSWARDACTIVITYRESPONSE.fields = {RIDINGSWARDACTIVITYRESPONSE_STATE_FIELD, RIDINGSWARDACTIVITYRESPONSE_TIME_FIELD, RIDINGSWARDACTIVITYRESPONSE_MODELINFO_FIELD, RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD, RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD} RIDINGSWARDACTIVITYRESPONSE.is_extendable = false RIDINGSWARDACTIVITYRESPONSE.extensions = {} RIDINGSWARDINFOREQUEST.name = "RidingSwardInfoRequest" diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index 438d676b54..84651b912f 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -4,6 +4,7 @@ local riceCtrl = require("Modules/YuJianXing/RiceCtrlView") local bgList = {"y_yujianxing_bg","y_yujianxing_bg","y_yujianxing_bg","y_yujianxing_bg","y_yujianxing_bg"} function this.Initialize() + this.joinCount = 0--参与投注的轮数 this.curState = 0 --当前比赛状态 this.nextTimeCount = 0 --下轮开始时间 this.activityTimeCount = 0 --活动倒计时 @@ -45,6 +46,7 @@ end --更新服务器界面信息 function this.UpdataServerPanelData(msg,func) + this.joinCount = msg.state--参与投注的轮数 this.curState = msg.state--当前状态 if msg.state == 1 then this.InWaiting = false diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index 56c11c04ac..74eb3bc3af 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -1,5 +1,6 @@ require("Base/BasePanel") local YuJianXingPanel = Inherit(BasePanel) +local configData = ConfigManager.GetConfigData(ConfigName.RidingSwardConfig,1) --初始化组件(用于子类重写) function YuJianXingPanel:InitComponent() @@ -99,6 +100,7 @@ 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()