diff --git a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua index 8e16a6cc..fe464984 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua @@ -322,11 +322,11 @@ function M:FillItemData(room, data, item, active_player) -- local total_score = data["total_score"] if total >= 0 then - item:GetChild("score2").text = "+"..total - item:GetChild("score2").grayed = false + item:GetChild("score2win").text = "+" .. total + -- item:GetChild("score2win").grayed = false else - item:GetChild("score2").text = total - item:GetChild("score2").grayed = true + item:GetChild("score2lose").text = total + -- item:GetChild("score2win").grayed = true end local hp_nonnegative = room:checkHpNonnegative() diff --git a/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua b/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua index f685a679..37319c94 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/changsha/MJPlayerCardInfoView.lua @@ -31,86 +31,86 @@ local function CardPos(obj, area, oder, loc, offset) return location end -function M:UpdateHandCard(getcard, mp, opcard) - -- mp 是否明牌 - -- 如果不明牌，但是有 opcard 表示是起手胡 - getcard = getcard or false - mp = mp or false - local handcard_list = self._mask_data["handcard_list"] - local oder = handcard_list["oder"] - local _player = self._player - local comp_back = handcard_list["comp_back"] - local comp = handcard_list["comp"] - local outcard_list = self._mask_data["outcard_list"] - local card = outcard_list["card"] +-- function M:UpdateHandCard(getcard, mp, opcard) +-- -- mp 是否明牌 +-- -- 如果不明牌，但是有 opcard 表示是起手胡 +-- getcard = getcard or false +-- mp = mp or false +-- local handcard_list = self._mask_data["handcard_list"] +-- local oder = handcard_list["oder"] +-- local _player = self._player +-- local comp_back = handcard_list["comp_back"] +-- local comp = handcard_list["comp"] +-- local outcard_list = self._mask_data["outcard_list"] +-- local card = outcard_list["card"] - self._area_handcard_list:RemoveChildren(0, -1, true) - local opnum = opcard and #opcard or -1 - if not mp and opnum > -1 then - -- 起手胡板牌记录,手牌变化两次后,板牌收回 - self.__show_qs_hu_times = 1 - self.__qs_hu_cards = opcard - elseif self.__qs_hu_cards and opnum == -1 and self.__show_qs_hu_times > 0 then - self.__show_qs_hu_times = self.__show_qs_hu_times - 1 - opcard = self.__qs_hu_cards - opnum = #opcard - end - local loc = 0 - if not mp then - local comp_back = handcard_list["comp_back"] - if self._current_card_type == 2 then - comp_back = comp_back.."_3d" - end - for i = 0, _player.hand_left_count -1 do - local obj - local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0) - if i < opnum then - obj = UIPackage.CreateObject("Main_Majiang", comp) - self:fillCard(obj, card, opcard[i + 1]) - else - obj = UIPackage.CreateObject("Main_Majiang", comp_back) - end - if opnum ~= -1 then - loc = CardPos(obj, self._area_handcard_list, oder, loc, offset) - else - ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) - end - --改变左右两边的手牌的x值 - if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then - obj.x = i * -7.0 - end - if (oder == AreaOderType.down_up) then - self._area_handcard_list:AddChildAt(obj, 0) - else - self._area_handcard_list:AddChild(obj) - end - end - else - local outcard_list = self._mask_data["outcard_list"] - local comp = handcard_list["comp"] - local card = outcard_list["card"] - --print("comp"..comp) - -- print(vardump(_player.card_list)) +-- self._area_handcard_list:RemoveChildren(0, -1, true) +-- local opnum = opcard and #opcard or -1 +-- if not mp and opnum > -1 then +-- -- 起手胡板牌记录,手牌变化两次后,板牌收回 +-- self.__show_qs_hu_times = 1 +-- self.__qs_hu_cards = opcard +-- elseif self.__qs_hu_cards and opnum == -1 and self.__show_qs_hu_times > 0 then +-- self.__show_qs_hu_times = self.__show_qs_hu_times - 1 +-- opcard = self.__qs_hu_cards +-- opnum = #opcard +-- end +-- local loc = 0 +-- if not mp then +-- local comp_back = handcard_list["comp_back"] +-- if self._current_card_type == 2 then +-- comp_back = comp_back.."_3d" +-- end +-- for i = 0, _player.hand_left_count -1 do +-- local obj +-- local offset = (getcard and i == _player.hand_left_count - 1) and 15 or 0 +-- if i < opnum then +-- obj = UIPackage.CreateObject("Main_Majiang", comp) +-- self:fillCard(obj, card, opcard[i + 1]) +-- else +-- obj = UIPackage.CreateObject("Main_Majiang", comp_back) +-- end +-- if opnum ~= -1 then +-- loc = CardPos(obj, self._area_handcard_list, oder, loc, offset) +-- else +-- ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) +-- end +-- --改变左右两边的手牌的x值 +-- if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then +-- obj.x = i * -7.0 +-- end +-- if (oder == AreaOderType.down_up) then +-- self._area_handcard_list:AddChildAt(obj, 0) +-- else +-- self._area_handcard_list:AddChild(obj) +-- end +-- end +-- else +-- local outcard_list = self._mask_data["outcard_list"] +-- local comp = handcard_list["comp"] +-- local card = outcard_list["card"] +-- --print("comp"..comp) +-- -- print(vardump(_player.card_list)) - if self._current_card_type == 2 then - comp = comp.."_3d" - end - for i = 0, #_player.card_list -1 do - local obj = UIPackage.CreateObject("Main_Majiang", comp) - self:fillCard(obj,card,_player.card_list[i+1]) - local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0) - ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) - --改变左右两边的手牌的x值 - if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then - obj.x = i * -7 - end - if (oder == AreaOderType.down_up) then - self._area_handcard_list:AddChildAt(obj, 0) - else - self._area_handcard_list:AddChild(obj) - end - end - end -end +-- if self._current_card_type == 2 then +-- comp = comp.."_3d" +-- end +-- for i = 0, #_player.card_list -1 do +-- local obj = UIPackage.CreateObject("Main_Majiang", comp) +-- self:fillCard(obj,card,_player.card_list[i+1]) +-- local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0) +-- ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset) +-- --改变左右两边的手牌的x值 +-- if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then +-- obj.x = i * -7 +-- end +-- if (oder == AreaOderType.down_up) then +-- self._area_handcard_list:AddChildAt(obj, 0) +-- else +-- self._area_handcard_list:AddChild(obj) +-- end +-- end +-- end +-- end return M \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index b0a6eb7f..44c84890 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -148,6 +148,12 @@ "/buttons/", "27vd145b", "/conMui/", + "egnzysm7", + "/", + "egnzysm7", + "/component/", + "egnzysm7", + "/component/create_room/", "3n2top74", "/", "5cdldr01", diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png index 79d3b882..dda7744e 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png index 9d0ef0f5..d5195416 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png index 5aabd246..231b5800 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png index e6369d7f..afd418b7 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png index 6c488750..d551f073 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png index e7987730..a5db5bf4 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png index 854be95b..76138ac5 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png index 804cf583..f5412131 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png index e1aafdba..dc5af118 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png index 3e665633..9a507ba9 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png index b3746305..617cfc28 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png index 02175cfe..5d4ff6a2 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png index ad926435..20054349 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes index 33fc6476..198e41df 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes index 3e8400a9..984020c5 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes index 9a24b917..6d0d5fc6 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes differ diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes index 4b33f419..8cbfec61 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ diff --git a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte index 19f94eb7..f88bcf59 100644 Binary files a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte and b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes index ce96f87d..5dd69629 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes index d4ce61b3..cfe56b2c 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes index 151b640d..ebe6e17e 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes index f3078ef3..7aa9d0c9 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes index 8d637ad9..51ce2bf6 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes index 5ea531b2..56841a16 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes index 259137ee..5d95cd19 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes differ