diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index d998572b..8b5c1b2d 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -21,6 +21,7 @@ function FamilyNumberRecord.New(root, page) self._data_minPage = page - 1 local group_id = self.group_id + local group = DataManager.groups:get(group_id) local MJScore = 0 local PKScore = 0 local fgCtr = ControllerManager.GetController(NewGroupController) @@ -58,6 +59,7 @@ function FamilyNumberRecord.New(root, page) self._viewText_titleRecord.text = string.format("%s 成员记录", self._text_groupTitle) self._view:GetChild('text_residueDiamond').text = root._group.diamo self._view:GetChild('text_timeRecord').text = os.date('%Y-%m-%d %H:%M:%S', os.time()) + self._view:GetController('lev').selectedIndex = group.lev == 1 and 0 or 1 self:InitTimeAndSord() self:NumverRecordRenderer(group_id) diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index 24937130..6a8d6a99 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -36,7 +36,7 @@ function M:init() local view = self._view UIPackage.AddPackage('base/chat/ui/Chat') self._tex_player_name = view:GetChild('name') - self._tex_score = view:GetChild('text_score') + self._tex_score = view:GetChild('text_jifen') self._biaoqing = view:GetChild('face') self._chat = view:GetChild('chat') diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 3a8a81db..cc7f362b 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -354,7 +354,7 @@ function M:EventInit() local index = self:GetPos(win_seat) local info = self._player_card_info[index] self:RemoveCursor() - info:UpdateHandCard(false, true) + info:UpdateHandCard(false, false) local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card @@ -488,17 +488,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index ea0dce78..0f2848d8 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -485,17 +485,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index bb29558b..a7e42722 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -490,17 +490,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 115c3171..215c6ee7 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -353,7 +353,7 @@ function M:EventInit() local index = self:GetPos(win_seat) local info = self._player_card_info[index] self:RemoveCursor() - info:UpdateHandCard(false, true) + info:UpdateHandCard(false, false) local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card @@ -490,17 +490,17 @@ function M:EventInit() card_info:Clear() card_info:ResetCardType() if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp + p.cur_hp = data[i].total_score end -- info:UpdateScore() info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_hp + local num = data[i].total_score if num >= 0 then info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. d2ad(num) + info._view:GetChild("text_jifen").text = "+" .. num else info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = d2ad(num) + info._view:GetChild("text_jifen").text = num end info._view:GetChild("mask_piao").title = "" diff --git a/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml b/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml index 68a31c5f..088a08d9 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml @@ -8,7 +8,7 @@ - + diff --git a/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml b/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml index 08738a41..1cd8064e 100644 --- a/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml +++ b/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml @@ -1,10 +1,11 @@ - + + @@ -41,7 +42,7 @@ - + @@ -67,29 +68,29 @@ - + - + - + - + - + - + @@ -142,9 +143,15 @@ - - - + + + + + + + + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml index a8b2232a..3898d748 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml @@ -1,7 +1,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml index 9a43fd86..5cf3237b 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml @@ -24,12 +24,12 @@ - + - + diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index 7477c898..cbc1cbe1 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ diff --git a/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml b/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml index 896e1420..26c3e69a 100644 --- a/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml +++ b/wb_unity_pro/Assets/Plugins/Android/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -23,7 +23,7 @@ android:label="@string/app_name" android:theme="@style/UnityThemeSelector"> - - + +