From 6b5d13378e0f6c849bdcf055faa0e7eed2be7855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Fri, 30 May 2025 18:25:39 +0800 Subject: [PATCH] =?UTF-8?q?30=E4=B8=8B=E5=8D=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MngView/GroupPartnerRewardsView.lua | 19 ++++----- wb_new_ui/.objs/metas/m7iejg46/gls1hif.info | 3 ++ wb_new_ui/assets/Hotupdate/Version.xml | 2 +- .../assets/Hotupdate/commpoent/Slider1.xml | 4 +- wb_new_ui/assets/Lobby/Main.xml | 4 +- .../component/group/component/guoup_item.xml | 2 +- wb_new_ui/assets/NewGroup/Main_GroupInfo.xml | 40 +++++++++--------- .../assets/NewGroup/Win_PartnerRewards.xml | 4 +- .../assets/NewGroup/Win_PlayerInfoForAdd.xml | 14 +++--- .../assets/NewGroup/Win_PlayerInfoForAdd2.xml | 14 +++--- .../NewGroup/component/Btn/Btn_back1.xml | 6 ++- .../NewGroup/component/Btn/ComboBox3.xml | 2 +- .../Lst_friend/Item_friend_fag_record.xml | 30 ++++++------- .../component/Lst_room/Gcm_Play_desk1.xml | 6 +-- .../component/Lst_room/Gcm_Play_desk2.xml | 6 +-- .../component/Lst_room/Gcm_Play_desk3.xml | 6 +-- .../component/Lst_room/Play_room1.xml | 14 +++--- .../component/Lst_room/Play_room2.xml | 14 +++--- .../component/Lst_room/Play_room3.xml | 12 +++--- .../NewGroup/component/nav/match_back.png | Bin 2489 -> 7276 bytes wb_new_ui/assets/NewGroup/images/Button10.xml | 2 +- .../NewGroup/images/allNumber/Group 583.png | Bin 1008 -> 918 bytes .../assets/NewGroup/images/common/fanhui.png | Bin 2489 -> 7276 bytes .../assets/NewGroup/images/info/Group 629.png | Bin 8379 -> 8536 bytes .../NewGroup/images/info/Group 629@2x.png | Bin 23736 -> 22609 bytes .../assets/NewGroup/mgr/View_GroupFagList.xml | 8 ++-- .../NewGroup/mgr/View_GroupMemberHpList.xml | 2 +- .../mgr/View_GroupMemberInviteAlone.xml | 34 +++++++-------- .../NewGroup/mgr/View_GroupMemberList1.xml | 22 +++++----- .../assets/NewGroup/mgr/View_GroupMenKang.xml | 12 +++--- .../NewGroup/mgr/View_GroupPartnerList.xml | 10 ++--- .../NewGroup/mgr/View_GroupPartnerList1.xml | 4 +- .../NewGroup/mgr/View_GroupPersonStat.xml | 12 +++--- .../NewGroup/mgr/View_GroupPiLaoZhi.xml | 2 +- .../NewGroup/mgr/View_GroupPlayStat.xml | 14 +++--- .../assets/NewGroup/mgr/View_GroupRank.xml | 2 +- .../mgr/component/member/item_member1.xml | 4 +- .../member/partner/item_mng_partner.xml | 26 ++++++------ .../member/partner/item_mng_partner1.xml | 12 +++--- .../mgr/component/numberHpAlone/Btn_back1.xml | 4 +- .../component/numberHpAlone/item_member1.xml | 2 +- .../component/numberHpAlone/item_member2.xml | 2 +- .../component/numberHpAlone/item_member3.xml | 2 +- .../component/numberHpAlone/item_member4.xml | 4 +- .../proportion/Item_friend_fag_mgr_record.xml | 26 ++++++------ .../mgr/component/rank/rank_item0.xml | 6 +-- .../mgr/component/record/Item_mng_name.xml | 6 +-- .../mgr/component/record/item_play_record.xml | 14 +++--- .../component/reward/item_partner_rewards.xml | 16 ++++--- wb_new_ui/assets/NewGroup/package.xml | 2 +- 50 files changed, 231 insertions(+), 221 deletions(-) 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 @@