diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index fbf98428..5111894a 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -107,7 +107,7 @@ function M:OnRenderRewardsItem(index, obj) local input_type = data.rewardValueType == 1 and 0 or 3 obj:GetChild("btn_set").onClick:Set(function() local gfiv = GroupNumberInputView.new(self._root_view, function(num) - local tem = num + local tem = num * 1000 if data.rewardValueType == 2 then tem = ad2d(tem) end @@ -127,11 +127,10 @@ function M:OnRenderRewardsItem(index, obj) ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败") else data.cur_value = tem - obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, - group.lev < 3, data.rewardValueType or 1) + obj:GetChild("tex_rewards").text = d2ad(data.cur_value) end end) - end, input_type) + end, 3) gfiv:Show() end) obj:GetChild("btn_set_all").onClick:Set(function() @@ -167,12 +166,12 @@ function M:OnRenderRewardsItem(index, obj) local input_type1 = data.xipai_rewardValueType == 1 and 0 or 3 obj:GetChild("btn_set1").onClick:Set(function() local gfiv = GroupNumberInputView.new(self._root_view, function(num) - local tem = num + local tem = num * 1000 if data.xipai_rewardValueType == 2 then tem = ad2d(tem) end - if tem > data.xipai_max_value then + if tem / 1000 > data.xipai_max_value then ViewUtil.ErrorTip(nil, "输入值超过上限") return -- elseif tem < data.cur_value then @@ -192,7 +191,7 @@ function M:OnRenderRewardsItem(index, obj) group.lev < 3, data.xipai_rewardValueType or 1) end end) - end, input_type1) + end, 3) gfiv:Show() end) @@ -231,12 +230,12 @@ function M:OnRenderRewardsItem(index, obj) local input_type2 = data.anchou_rewardValueType == 1 and 0 or 3 obj:GetChild("btn_set2").onClick:Set(function() local gfiv = GroupNumberInputView.new(self._root_view, function(num) - local tem = num + local tem = num * 1000 if data.anchou_rewardValueType == 2 then tem = ad2d(tem) end - if tem > data.xipai_max_value then + if tem / 1000 > data.xipai_max_value then ViewUtil.ErrorTip(nil, "输入值超过上限") return -- elseif tem < data.cur_value then @@ -256,7 +255,7 @@ function M:OnRenderRewardsItem(index, obj) data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) end end) - end, input_type2) + end, 3) gfiv:Show() end) diff --git a/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info b/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info index dea2072f..16898f9c 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info +++ b/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info @@ -6,6 +6,9 @@ "n11_cpin": { "hidden": true }, + "n15_imp5": { + "hidden": true + }, "n12_cpin": { "hidden": true }, diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml index 0469daf7..60d4fea6 100644 --- a/wb_new_ui/assets/Hotupdate/Version.xml +++ b/wb_new_ui/assets/Hotupdate/Version.xml @@ -13,7 +13,7 @@ - + diff --git a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml index e6d2d0d5..bdc2cb83 100644 --- a/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml +++ b/wb_new_ui/assets/Hotupdate/commpoent/Slider1.xml @@ -4,7 +4,9 @@ - + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml index 2d49623c..7835cd18 100644 --- a/wb_new_ui/assets/Lobby/Main.xml +++ b/wb_new_ui/assets/Lobby/Main.xml @@ -7,8 +7,8 @@ - - + + diff --git a/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml b/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml index ac96dab9..29acfe02 100644 --- a/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml +++ b/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml @@ -6,7 +6,7 @@ - + diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml index ec561ba0..7ad0ac6b 100644 --- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml +++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + @@ -38,13 +38,13 @@