diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 9aef9439..1103d33a 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1718,3 +1718,15 @@ function M:WEB_FG_GET_GROUP_DETAIL(groupId, callback) callback(res) end) end + +-- 消息记录 +function M:FG_Get_Msg(groupId, callback) + local _data = {} + _data.id = groupId + local _client = ControllerManager.GroupClient + _client:send(Protocol.WEB_FG_Get_Mssages, _data, function(res) + print("消息记录返回") + pt(res) + callback(res) + end) +end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index d6ea1c36..12f66713 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -301,6 +301,9 @@ Protocol = { -- 获取某个家族的详细信息 WEB_FG_GET_GROUP_DETAIL = "group/get_groupDetail", + + -- 获取消息记录 + WEB_FG_Get_Mssages = "group/get_messages", -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", diff --git a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua index a910d543..f360d749 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua @@ -1,41 +1,97 @@ local FamilyMsgRecord = {} +-- m_state : 进入亲友圈(0)退出亲友圈(1)，创建亲友圈(2)，踢出亲友圈(3) +local function RequestData(self, groupId) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_Get_Msg(groupId, function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode) + return + end + + self.resData = res.Data.messages + + self:ReflashCallBack() + end) +end + +local function list_msgRender(self, index, obj) + local msg = self.resData[index + 1] + + local tex_msg = obj:GetChild("tex_msg") + local tex_time = obj:GetChild("tex_time") + local loader_icon = obj:GetChild("loader_icon") + + local msgText = '' + if msg.m_state == 0 then + msgText = string.format("【%s】被【%s】加入亲友圈", msg.user_name, msg.tag_name) + + + + elseif msg.m_state == 1 then + msgText = string.format("【%s】退出亲友圈", msg.user_name) + elseif msg.m_state == 2 then + msgText = string.format("【%s】创建亲友圈", msg.user_name) + elseif msg.m_state == 3 then + msgText = string.format("【%s】被【%s】踢出亲友圈", msg.user_name, msg.tag_name) + end + + tex_msg.text = msgText + tex_time.text = os.date('%Y-%m-%d %H:%M:%S', msg.m_time) + + ImageLoad.Load(msg.m_portrait, loader_icon) +end + function FamilyMsgRecord.New(callback) - setmetatable(FamilyMsgRecord, { __index = BaseWindow }) + setmetatable(FamilyMsgRecord, { __index = BaseView }) local inst = setmetatable({}, { __index = FamilyMsgRecord }) - inst._close_destroy = true - inst._full = true - inst._animation = false - inst._full_offset = false - inst._anim_pop = 0 - BaseWindow.init(inst, 'ui://Family/com_FamilyMsgRecord') + inst._full = false + inst._scale = true + inst.class = "com_FamilyMsgRecord" + BaseView.InitView(inst, 'ui://Family/com_FamilyMsgRecord') inst:Init() - inst._root_view:GetChild("win_mode").visible = false inst.closeCallback = callback return inst end -function FamilyMsgRecord:Show() - BaseWindow.Show(self) +function FamilyMsgRecord:Show(groupId) + BaseView.Show(self) + self:Reflash(groupId) +end + +function FamilyMsgRecord:Reflash(groupId) + RequestData(self, groupId) +end + +function FamilyMsgRecord:ReflashCallBack() + self.list_msg.numItems = #self.resData + --self.list_msg:RefreshVirtualList() end function FamilyMsgRecord:Init() + self.list_msg = self._view:GetChild("list_msg") + self.btn_quit = self._view:GetChild("btn_quit") self.btn_quit.onClick:Set(function() self:Close() end) + + self.list_msg.itemRenderer = function(index, obj) + list_msgRender(self, index, obj) + end + + self.list_msg:SetVirtual() end function FamilyMsgRecord:Close() - - if self.closeCallback then + if self.closeCallback then self.closeCallback() end - BaseWindow.Close(self) + BaseView.Close(self) end -return FamilyMsgRecord \ No newline at end of file +return FamilyMsgRecord diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 18e985e6..c5ebc8bd 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -292,12 +292,8 @@ function M:ShareWx() end function M:MsgView() - self.lastType = self.familyType.selectedIndex - self.familyType.selectedIndex = 0 - local view = FamilyMsgRecord.New(function() - self.familyType.selectedIndex = self.lastType - end) - view:Show() + local view = FamilyMsgRecord.New() + view:Show(self._group.id) end function M:SetIsOpenChatRoom() diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml b/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml index 38a2d687..72fe0c81 100644 --- a/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml +++ b/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml @@ -195,7 +195,6 @@ - diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/别人胡.xml b/wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/别人胡.xml deleted file mode 100644 index 9c02bfb4..00000000 --- a/wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/别人胡.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/自己胡牌.xml b/wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/自己胡牌.xml deleted file mode 100644 index 415981a2..00000000 --- a/wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/自己胡牌.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml b/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml index 258d28e6..a0be830a 100644 --- a/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml +++ b/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml @@ -181,8 +181,6 @@ - - diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg.xml b/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg.xml index 95e8d15e..8775a3f4 100644 --- a/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg.xml +++ b/wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg.xml @@ -1,10 +1,10 @@ - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml b/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml index 589a7795..73a05d46 100644 --- a/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml +++ b/wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml @@ -1,26 +1,27 @@ - - + + - + + + + + + + + - - + + - - - - - - - - - - - + + + + + diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 606ea7f4..59086f8e 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -22,11 +22,10 @@ - - + diff --git a/wb_new_ui/assets/Family/NumberList/com_numberList.xml b/wb_new_ui/assets/Family/NumberList/com_numberList.xml index 77d755d0..0ea09183 100644 --- a/wb_new_ui/assets/Family/NumberList/com_numberList.xml +++ b/wb_new_ui/assets/Family/NumberList/com_numberList.xml @@ -11,7 +11,7 @@ - + diff --git a/wb_new_ui/assets/Family/PlayEdit/com_playEdit.xml b/wb_new_ui/assets/Family/PlayEdit/com_playEdit.xml index 0f7a30c3..5ecc5773 100644 --- a/wb_new_ui/assets/Family/PlayEdit/com_playEdit.xml +++ b/wb_new_ui/assets/Family/PlayEdit/com_playEdit.xml @@ -12,7 +12,16 @@ - + + + + + + + + + + diff --git a/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml b/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml index 28c410c4..2f30a4de 100644 --- a/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml +++ b/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml @@ -11,7 +11,7 @@ - + diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index 4963b2a4..ff0fd6ad 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -366,11 +366,11 @@ - - - - - + + + + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml index 531f1b1c..6e188760 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml @@ -1,7 +1,7 @@ - + @@ -105,7 +105,6 @@ - diff --git a/wb_new_ui/assets/Main_Majiang/bg2.png b/wb_new_ui/assets/Main_Majiang/bg2.png deleted file mode 100644 index ac92f6b4..00000000 Binary files a/wb_new_ui/assets/Main_Majiang/bg2.png and /dev/null differ diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml index b5f0d79f..69f56cce 100644 --- a/wb_new_ui/assets/Main_Majiang/package.xml +++ b/wb_new_ui/assets/Main_Majiang/package.xml @@ -1026,7 +1026,6 @@ - @@ -1528,5 +1527,5 @@ - + \ No newline at end of file diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png index 81e8cd61..c745f04f 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png index e8127b27..a1009e1d 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png index cd9603be..8ce30330 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png index 696ef1a1..99d4243f 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png index 4b08989e..930f5d09 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png deleted file mode 100644 index 930f5d09..00000000 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta deleted file mode 100644 index 61fa59a4..00000000 --- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta +++ /dev/null @@ -1,92 +0,0 @@ -fileFormatVersion: 2 -guid: 93fbe85eee0acec498778b5125cda3e1 -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: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4 - assetBundleVariant: 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 ec918829..3988927a 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/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png index 8ac7b989..99196a06 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png index 61a8f391..4a078610 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png index 618fd7ae..c2de2054 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png index b1dac1df..930d4424 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png index 6a4375be..bc537328 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta index 87a2806d..8ad5b8a4 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 3ad3937da18bb154e8135801fe276a86 -======= -guid: f5dfe2527407f0847b118e5033b6d3ca ->>>>>>> 2e92757ba3fe3e5c4b058b254d41c2efd68dec7a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -61,14 +57,50 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -92,9 +124,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: -<<<<<<< HEAD assetBundleName: -======= - assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b ->>>>>>> 2e92757ba3fe3e5c4b058b254d41c2efd68dec7a assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index 45c12e84..7cddc881 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png index d3ff9815..f235d491 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png deleted file mode 100644 index 71ed5525..00000000 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta deleted file mode 100644 index e4352ffc..00000000 --- a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta +++ /dev/null @@ -1,92 +0,0 @@ -fileFormatVersion: 2 -guid: 0e38ff08c92b6fe4f9fb606078139c8f -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: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70 - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png deleted file mode 100644 index 59833451..00000000 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta deleted file mode 100644 index 7bc83ccc..00000000 --- a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta +++ /dev/null @@ -1,92 +0,0 @@ -fileFormatVersion: 2 -guid: 4bc6de557fd8b01469ea797a88fab6e7 -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: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70 - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png deleted file mode 100644 index 3e2edf13..00000000 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta deleted file mode 100644 index b0def606..00000000 --- a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta +++ /dev/null @@ -1,92 +0,0 @@ -fileFormatVersion: 2 -guid: dbed66f7225e8e947bf642537b101869 -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: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70 - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes index 3edb311e..e326349e 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png index 5ad095f2..3446b576 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png deleted file mode 100644 index cd71e712..00000000 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta deleted file mode 100644 index 116d249a..00000000 --- a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta +++ /dev/null @@ -1,92 +0,0 @@ -fileFormatVersion: 2 -guid: 1bac4deafc7d3de4eb47ce486a4975ea -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: extend/majiang/jinxi/d6500faabd8efe9ea4f5aef4daf5e9dd - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes index ba80b7e4..6c4a3fa7 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes differ 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 b4c1b2df..ba3b67c8 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 deleted file mode 100644 index 31939fe9..00000000 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png and /dev/null 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 deleted file mode 100644 index 458b96ff..00000000 --- a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta +++ /dev/null @@ -1,92 +0,0 @@ -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: extend/majiang/lichuan/8dba1742414c996765e2bd85d1b4bea7 - 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 26abc784..265682a6 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 diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png index 7df52f64..baa7788a 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png deleted file mode 100644 index cd71e712..00000000 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png and /dev/null differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta deleted file mode 100644 index 6ea89f72..00000000 --- a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta +++ /dev/null @@ -1,92 +0,0 @@ -fileFormatVersion: 2 -guid: 67a875cabb31a38438757231517e845b -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: extend/majiang/nancheng/704ffdeb1d214471a2c68eb82f8ff5c9 - assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes index cea3eb12..e473368f 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes differ