diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index 6f5335d2..6fd46e6c 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -120,6 +120,7 @@ function M:OnEventSendCards(evt_data) local jing = evt_data["jing"] self._cacheEvent:Enqueue(function() _room.banker_seat = seat + print("========================fuzhijing") _room.jing = jing for i = 1, #_room.player_list do _room.player_list[i].hand_left_count = 13 @@ -245,11 +246,11 @@ function M:OnEventFzAction(evt_data) fz.active_card = actice_card if (index == -1) then if (ftype == FZType.Chi) then - local data = {} - data[1] = opcard[1] - data[2] = card - data[3] = opcard[2] - fz.opcard = data + local data = {} + data[1] = opcard[1] + data[2] = card + data[3] = opcard[2] + fz.opcard = data end p.fz_list[#p.fz_list + 1] = fz end @@ -274,6 +275,7 @@ function M:OnEventFzAction(evt_data) end function M:OnEventHu(evt_data) + print("===========================OnEventHu") local cards = evt_data["card"] local win_p = self._room:GetPlayerBySeat(evt_data["seat"]) local lose_p = self._room:GetPlayerBySeat(evt_data["from_seat"]) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index e2911f52..9e83fc35 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -233,6 +233,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction)) _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...) + print("==============================================ZPHuCard") self._left_time = 0 self:UpdateCardBox(0) self:__CloseTip() @@ -312,6 +313,7 @@ function M:EventInit() local tem = win_list[i] if tem.type > 0 and tem.type < 32 then local com_name = "he" .. tem.type + print("===================================com_name", com_name) local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_LiChuan/" .. com_name) coroutine.wait(0.3) end diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png index 28cea43d..87912a4a 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png new file mode 100644 index 00000000..33f7fee1 Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta new file mode 100644 index 00000000..c0d2d5e0 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: fe92826453867a142b205f15f933263f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes index d98a267a..55f3e8df 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes differ