diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua index 64e4e816..7bac0aa2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua @@ -411,9 +411,11 @@ function M:FillFagData() local v = string.gsub(r_item:GetChild("cb_min").title, "分", "") -- self.hpData.UpperLimit = ad2d(tonumber(v)) tem.UpperLimit = ad2d(tonumber(v)) - + local vsend = string.gsub(r_item:GetChild("cb_min_send").title, "分", "") tem.UpperLimitReward = ad2d(tonumber(vsend)) + + tem.UpperLimitRewardsub = r_item:GetController("give_owner_sub").selectedIndex else local v = string.gsub(r_item:GetChild("cb_max").title, "分", "") -- self.hpData.UpperLimit = ad2d(tonumber(v)) @@ -613,6 +615,7 @@ function M:OnRenderItem(index, obj) local cb_min_send = obj:GetChild("cb_min_send") local UpperLimit = d2ad(data.UpperLimit) local UpperLimitReward = d2ad(data.UpperLimitReward or 0) + local UpperLimitRewardsub = d2ad(data.UpperLimitRewardsub or 0) if tonumber(cb_method.value) == 1 then cb_min.title = UpperLimit .. "分" or "0分" cb_min_send.title = UpperLimitReward .. "分" or "0分" @@ -621,6 +624,12 @@ function M:OnRenderItem(index, obj) else obj:GetController("give_owner").selectedIndex = 1 end + + if UpperLimitRewardsub == 0 then + obj:GetController("give_owner_sub").selectedIndex = 0 + else + obj:GetController("give_owner_sub").selectedIndex = 1 + end else cb_max.value = UpperLimit .. "分" self:SetIndex(cb_max, d2ad(data.UpperLimit)) @@ -632,6 +641,12 @@ function M:OnRenderItem(index, obj) self:UpdateRewards() end end) + obj:GetController("give_owner_sub").onChanged:Add(function() + -- if obj:GetController("give_owner_sub").selectedIndex == 0 then + data.UpperLimitRewardsub = obj:GetController("give_owner_sub").selectedIndex + self:UpdateRewards() + -- end + end) if cb_max.selectedIndex == -1 then cb_max.selectedIndex = 0 @@ -654,7 +669,12 @@ function M:OnRenderItem(index, obj) end local tem1 = "" if UpperLimitReward ~= 0 then - tem1 = string.format(",每个玩家赠送盟主%s分", UpperLimitReward) + if UpperLimitRewardsub~=0 then + tem1 = string.format(",赢家赠送盟主%s分", UpperLimitReward) + else + tem1 = string.format(",每个玩家赠送盟主%s分", UpperLimitReward) + end + end str_min_tip = string.format("(低于%s分不抽水%s)", UpperLimit, tem1) -- str_max_tip = string.format("(低于%s按此设置抽水)", UpperLimit) diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 4f00164d..523b9b33 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,8 +1,55 @@ { - "doc.openedDocs": [], - "libview.iconScale": 0, - "libview.currentGroup": "", - "libview.expandedNodes": [], "libview.firstColumnWidth": 297, - "libview.twoColumn": false + "libview.iconScale": 0, + "doc.openedDocs": [ + "ui://m7iejg46hsbhhjn", + "ui://m7iejg46c0or7i7d", + "ui://m7iejg46nwgkhx2", + "ui://m7iejg46nwgkhx0", + "ui://m7iejg46ozazhxs", + "ui://m7iejg46cioehos", + "ui://m7iejg468h207i99", + "ui://m7iejg46kwdo7i97", + "ui://m7iejg46cvc87i5y", + "ui://m7iejg46nk4vhwh", + "ui://m7iejg4610snh5j", + "ui://m7iejg46kwi0hk0", + "ui://m7iejg46qlxihsm", + "ui://m7iejg46kwi0hk1", + "ui://m7iejg46kwi0hkb", + "ui://m7iejg46ilon7ias", + "ui://m7iejg46i5987i75", + "ui://m7iejg46ilon7i9k", + "ui://m7iejg46ilon7ia2", + "ui://m7iejg46kwi0hkr", + "ui://m7iejg46z3847i6m", + "ui://m7iejg46kk3uhrk", + "ui://m7iejg46kk3uhrm", + "ui://m7iejg46tqi8hwa", + "ui://m7iejg46jr1l7i3c", + "ui://m7iejg46ilon7ibl", + "ui://m7iejg46k5m97i76", + "ui://m7iejg46taski05", + "ui://m7iejg46i9oq7i3m", + "ui://m7iejg46w111hhx", + "ui://m7iejg46avqi7ijp", + "ui://m7iejg46kk3uhrs", + "ui://m7iejg46irlqhyt" + ], + "auxline1": true, + "canvasColor": 10066329, + "auxline2": true, + "doc.activeDoc": "ui://m7iejg46z3847i6m", + "libview.twoColumn": false, + "libview.expandedNodes": [ + "m7iejg46", + "/", + "m7iejg46", + "/mgr/" + ], + "snapToGrid": true, + "backgroundColor": 6710886, + "libview.currentGroup": "", + "gridSize": 30, + "gridColor": 80 } \ No newline at end of file diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml index 0386ddf0..7d6433d0 100644 --- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml +++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml @@ -24,7 +24,7 @@ - + diff --git a/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml b/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml index f1bcbec7..4c586e14 100644 --- a/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml +++ b/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml @@ -6,7 +6,8 @@ - + + @@ -125,19 +126,19 @@ - + - + - + -