积分修复

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1575,13 +1575,14 @@ end
 ---@param mj_score number 麻将限制分
 ---@param pk_score number 扑克限制分
 ---@param callback function 回调函数
-function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, callback)
+function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, day, callback)
     local _client = ControllerManager.GroupClient
     local _data = {}
     _data.id = group_id
     _data.playerId = playerId
     _data.mj_score = mj_score
     _data.pk_score = pk_score
+    _data.day = day
     _client:send(Protocol.WEB_FG_SET_JOIN_SCORE, _data, function(res)
         callback(res)
     end)

lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua

@@ -37,7 +37,7 @@ end
 
 local function ChatItemRenderer(index, obj, self)
 
-    local data = self.ChatRoomData[index + 1]
+    local data = self.ChatRoomData.records[index + 1]
     local totalScore = json.decode(data.totalScore)
     SetBigWiller(totalScore)
 
@@ -111,7 +111,9 @@ function FamilyChatRoom:Close()
 end
 
 function FamilyChatRoom:Refalsh()
-    self.list_chat.numItems = #self.ChatRoomData
+    pt(self.ChatRoomData[1])
+    self.records = json.decode(self.ChatRoomData[1].records)
+    self.list_chat.numItems = #self.records or 0
 end
 
 function FamilyChatRoom:Show()

lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua

@@ -22,15 +22,15 @@ function FamilyNumberRecord.New(root, page)
 
     local group_id = self.group_id
     local group = DataManager.groups:get(group_id)
-    local MJScore = 0
+    self.MJScore = 0
-    local PKScore = 0
+    self.PKScore = 0
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local input_IDSerach = self._view:GetChild('input_numberID')
     local text_allRound = self._view:GetChild('text_allRound')
     local text_winNum = self._view:GetChild('text_winNum')
     local text_useDiamond = self._view:GetChild('text_useDiamond')
-    local text_score_poker = self._view:GetChild('text_score_poker')
+    self.text_score_poker = self._view:GetChild('text_score_poker')
-    local text_score_majiang = self._view:GetChild('text_score_majiang')
+    self.text_score_majiang = self._view:GetChild('text_score_majiang')
     local box_type = self._view:GetChild('combBox_type')
     local box_mumberTime = self._view:GetChild('box_mumberTime')
     local ctr_day = self._view:GetController('day')
@@ -45,6 +45,7 @@ function FamilyNumberRecord.New(root, page)
     self._viewList_players = self._view:GetChild('list_players')
     self._viewList_recordDetail = self._view:GetChild('list_record_detail')
     self._viewText_titleRecord = self._view:GetChild('text_titleRecord')
+    self.btn_oneday = self._view:GetChild("btn_oneday")
 
     self.ctr_numberRecord = self._view:GetController('page')
     self._cte_noPeople = self._view:GetController('noPeople')
@@ -54,8 +55,8 @@ function FamilyNumberRecord.New(root, page)
 
     box_type.items, box_type.values = self:InitBoxType()
     box_mumberTime.items, box_mumberTime.values = self:InitBoxTime()
-    text_score_majiang.text = 0 - MJScore
+    self.text_score_majiang.text = 0 - self.MJScore
-    text_score_poker.text = 0 - PKScore
+    self.text_score_poker.text = 0 - self.PKScore
     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())
@@ -140,12 +141,18 @@ function FamilyNumberRecord.New(root, page)
     self._view:GetChild('btn_changeMJScore').onClick:Set(function()
         ViewUtil.ShowOneInput("修改麻将进入限制分", function(text)
             print("lingmeng修改扑克进入限制分", text)
-            fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), MJScore, function(res)
+            local day
+            if self.btn_oneday.selected then
+                day = 1
+            else
+                day = 2
+            end
+            fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), self.MJScore, day, function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode)
                 else
-                    MJScore = tonumber(text)
+                    self.MJScore = tonumber(text)
-                    text_score_majiang.text = 0 - MJScore
+                    self.text_score_majiang.text = 0 - self.MJScore
                 end
             end)
         end)
@@ -154,12 +161,18 @@ function FamilyNumberRecord.New(root, page)
     self._view:GetChild('btn_changePKScore').onClick:Set(function()
         ViewUtil.ShowOneInput("修改扑克进入限制分", function(text)
             print("lingmeng修改扑克进入限制分", text)
-            fgCtr:FG_SetJoinScore(group_id, 0, MJScore, tonumber(text), function(res)
+            local day
+            if self.btn_oneday.selected then
+                day = 1
+            else
+                day = 2
+            end
+            fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text), day, function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode)
                 else
-                    PKScore = tonumber(text)
+                    self.PKScore = tonumber(text)
-                    text_score_poker.text = 0 - PKScore
+                    self.text_score_poker.text = 0 - self.PKScore
                 end
             end)
         end)
@@ -461,6 +474,11 @@ function M:RecursionGetNumberRank(fgCtr, index, round, win, cost)
                 self.showRank = self.rank
                 self._viewList_numverRecord.numItems = #self.showRank
             end
+
+            self.text_score_majiang.text = 0 - info.mj_score
+            self.text_score_poker.text = 0 - info.pk_score
+            self.MJScore = info.mj_score
+            self.PKScore = info.pk_score
         end
     end)
 end

lua_probject/base_project/Game/View/Family/FamilySelectNumber.lua

@@ -1,5 +1,17 @@
 local FamilySelectNumber = {}
 
+local function search(self)
+    local t = self.input_search.text
+    local re = {}
+    for _, player in pairs(self.group.members) do 
+        if string.match(player.nick, t) then
+            re[#re + 1] = player
+        end
+    end
+
+    self.players = re
+end
+
 function FamilySelectNumber.New()
     setmetatable(FamilySelectNumber, { __index = BaseWindow})
     local inst = setmetatable({}, { __index = FamilySelectNumber})
@@ -17,20 +29,29 @@ function FamilySelectNumber.New()
     return inst
 end
 
+function FamilySelectNumber:Refalsh()
+    self.list_number.numItems = #self.players
+    --self.list_number.numItems = #self.group.members
+end
+
 function FamilySelectNumber:Show(groupId, callback)
     self.group = DataManager.groups.groupMap[groupId]
+    self.players = self.group.members
     self.callback = callback
-    self.list_number.numItems = #self.group.members
+    self:Refalsh()
     BaseWindow.Show(self)
 end
 
 function FamilySelectNumber:Init()
+
+    self.input_search = self._view:GetChild("input_search")
     self.list_number = self._view:GetChild("list_number")
     self.btn_search = self._view:GetChild("btn_search")
     self.btn_close = self._view:GetChild("btn_close")
 
     self.btn_search.onClick:Set(function()
-        
+        search(self)
+        self:Refalsh()
     end)
 
     self.btn_close.onClick:Set(function()
@@ -39,7 +60,7 @@ function FamilySelectNumber:Init()
 
     self.list_number.itemRenderer = function(index, obj)
         local i = index + 1
-        local player = self.group.members[i]
+        local player = self.players[i] --self.group.members[i]
         obj:GetController('lev').selectedIndex = player.lev - 1
         obj:GetController('ban').selectedIndex = player.ban
         obj:GetChild('name').text = player.nick

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_jifen')
+    -- self._tex_score = view:GetChild('text_jifen')
 
     self._biaoqing = view:GetChild('face')
     self._chat = view:GetChild('chat')
@@ -176,7 +176,7 @@ function M:UpdateScore(score)
         --     end
         -- end
     end
-    self._tex_score.text = tostring(score)
+    -- self._tex_score.text = tostring(score)
 end
 
 function M:SetStartType(peopleNum, seat)