hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步修改

master
罗家炜 2025-06-17 20:34:45 +08:00
parent a58f4ec1bb
commit a91a44def6
130 changed files with 142 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lua_probject/base_project/Game/View/FGAssistView.lua
View File

@ -101,9 +101,24 @@ function M:GetOnlinePlayers(index)
fgCtr:FG_GroupList(function(res) fgCtr:FG_GroupList(function(res)
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败")
else
fgCtr:FG_EnterGroup(self.group_id, function(res)
ViewUtil:CloseModalWait()
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败")
else
self:GetOnlinePlayersshow(fgCtr, DataManager.groups:get(self.group_id), index)
return 1
end
end)
end end
end) end)
else
self:GetOnlinePlayersshow(fgCtr, group, index)
end end
end
function M:GetOnlinePlayersshow(fgCtr, group, index)
if #group.members == 0 or index ~= 0 then if #group.members == 0 or index ~= 0 then
fgCtr:FG_GroupMembers12(self.group_id, 0, index + 10, 2, 2, function(res) fgCtr:FG_GroupMembers12(self.group_id, 0, index + 10, 2, 2, function(res)
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then

1
lua_probject/base_project/Game/View/Family/FamilyEventView.lua
View File

@ -83,6 +83,7 @@ function M:_evtInviteResponse(...)
local groupid = arg[5] local groupid = arg[5]
local roomCtr = ControllerManager.GetController(RoomController) local roomCtr = ControllerManager.GetController(RoomController)
local gameId = DataManager.groups:get(groupid):getPlay(pid).gameId local gameId = DataManager.groups:get(groupid):getPlay(pid).gameId
UIPackage.AddPackage('base/newgroup/ui/FGAssist')
local imv = local imv =
FGInvitedMsgView.new( FGInvitedMsgView.new(
self._root_view, self._root_view,

8
lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua
View File

@ -1,10 +1,10 @@
-- 被邀请界面 -- 被邀请界面
local FGInvitedMsgView = {} local FamilyInvitedMsgView = {}
local M = FGInvitedMsgView local M = FamilyInvitedMsgView
setmetatable(M, { __index = BaseWindow }) setmetatable(M, { __index = BaseWindow })
function FGInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback) function FamilyInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback)
print("lingmeng FGAssistInviteView") print("lingmeng FGAssistInviteView")
local self = setmetatable({}, { __index = M }) local self = setmetatable({}, { __index = M })
self.class = "FGAssistInviteView" self.class = "FGAssistInviteView"
@ -18,7 +18,7 @@ function FGInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback)
self.invite_id = invite_id self.invite_id = invite_id
self.callback = callback self.callback = callback
print("lingmeng FGAssistInviteView1") print("lingmeng FGAssistInviteView1")
UIPackage.AddPackage('base/newgroup/ui/FGAssist')
self:initView("ui://FGAssist/panel_invite") self:initView("ui://FGAssist/panel_invite")
print("lingmeng FGAssistInviteView2") print("lingmeng FGAssistInviteView2")

54
lua_probject/base_project/Game/View/NewGroup/FGInvitedMsgView.lua
View File

@ -2,17 +2,15 @@
local FGInvitedMsgView = {} local FGInvitedMsgView = {}
local M = FGInvitedMsgView local M = FGInvitedMsgView
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
function FGInvitedMsgView.new(blur_view, group_id, callback) function FGInvitedMsgView.new(blur_view, group_id, callback)
local self = setmetatable({}, { __index = M })
local self = setmetatable({}, {__index = M})
self.class = "FGInvitedMsgView" self.class = "FGInvitedMsgView"
self._blur_view = blur_view self._blur_view = blur_view
self._animation = true self._animation = true
self._close_destroy = true self._close_destroy = true
self._close_time = 15 self._close_time = 15
self.group_id = group_id self.group_id = group_id
self.callback = callback self.callback = callback
UIPackage.AddPackage("base/newgroup/ui/FGAssist") UIPackage.AddPackage("base/newgroup/ui/FGAssist")
@ -21,51 +19,51 @@ function FGInvitedMsgView.new(blur_view, group_id, callback)
end end
function M:FillData(data) function M:FillData(data)
self._view:GetChild("tex_name").text = data.nick self._view:GetChild("tex_name").text = data.nick
self._view:GetChild("tex_id").text = "ID:" .. data.uid self._view:GetChild("tex_id").text = "ID:" .. data.uid
local btn_head = self._view:GetChild("btn_head") local btn_head = self._view:GetChild("btn_head")
ImageLoad.Load(data.portrait, btn_head._iconObject) ImageLoad.Load(data.portrait, btn_head._iconObject)
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
local play = group:getPlay(data.pid) local play = group:getPlay(data.pid)
self._view:GetChild("tex_play_name").text = play and play.name or pid self._view:GetChild("tex_play_name").text = play and play.name or pid
self._view:GetChild("tex_game_name").text = data.g_name self._view:GetChild("tex_game_name").text = data.g_name
local btn_refuse = self._view:GetChild("btn_refuse") local btn_refuse = self._view:GetChild("btn_refuse")
local id = data.invi_id local id = data.invi_id
local btn_yes = self._view:GetChild("btn_yes") local btn_yes = self._view:GetChild("btn_yes")
btn_yes.onClick:Set(function() btn_yes.onClick:Set(function()
local refuse = btn_refuse.selected and 1 or 0 local refuse = btn_refuse.selected and 1 or 0
self:SendResponse(id, refuse) self:SendResponse(id, refuse)
self:Destroy() self:Destroy()
if self.callback then if self.callback then
self.callback(data.roomid) self.callback(data.roomid)
end end
end) end)
local btn_no = self._view:GetChild("btn_no") local btn_no = self._view:GetChild("btn_no")
btn_no.onClick:Set(function() btn_no.onClick:Set(function()
local refuse = btn_refuse.selected and 1 or 0 local refuse = btn_refuse.selected and 1 or 0
self:SendResponse(id, refuse) self:SendResponse(id, refuse)
self:Destroy() self:Destroy()
end) end)
self._co = coroutine.start(function() self._co = coroutine.start(function()
while self._close_time > 0 do while self._close_time > 0 do
coroutine.wait(1) coroutine.wait(1)
self._close_time = self._close_time - 1 self._close_time = self._close_time - 1
self:ShowLeftTime() self:ShowLeftTime()
end end
self:Destroy() self:Destroy()
end) end)
end end
function M:ShowLeftTime() function M:ShowLeftTime()
self._view:GetChild("tex_left_time").text = self._close_time .. "s" self._view:GetChild("tex_left_time").text = self._close_time .. "s"
end end
function M:SendResponse(id, refuse) function M:SendResponse(id, refuse)
local mgr_ctr = ControllerManager.GetController(GroupMgrController) local mgr_ctr = ControllerManager.GetController(GroupMgrController)
mgr_ctr:FG_ResponseInvited(id, refuse) mgr_ctr:FG_ResponseInvited(id, refuse)
end end
function M:Destroy() function M:Destroy()
@ -73,7 +71,7 @@ function M:Destroy()
coroutine.stop(self._co) coroutine.stop(self._co)
self._co = nil self._co = nil
end end
BaseWindow.Destroy(self) BaseWindow.Destroy(self)
end end
return M return M

2
wb_new_ui/assets/FGAssist/package.xml
View File

@ -32,7 +32,7 @@
<image id="cioehn1" name="hd.png" path="/invite/image/tool/" scale="9grid" scale9grid="18,22,36,44"/> <image id="cioehn1" name="hd.png" path="/invite/image/tool/" scale="9grid" scale9grid="18,22,36,44"/>
<component id="cioehnd" name="panel_assist.xml" path="/invite/" exported="true"/> <component id="cioehnd" name="panel_assist.xml" path="/invite/" exported="true"/>
<component id="cioehnj" name="panel_table.xml" path="/invite/"/> <component id="cioehnj" name="panel_table.xml" path="/invite/"/>
<component id="cioehnx" name="panel_invited--.xml" path="/invite/" exported="true"/> <component id="cioehnx" name="panel_invited--.xml" path="/invite/"/>
<component id="cioehmy" name="btn_assist.xml" path="/invite/" exported="true"/> <component id="cioehmy" name="btn_assist.xml" path="/invite/" exported="true"/>
<component id="pxf0ho6" name="checkbox.xml" path="/invite/component/invite/"/> <component id="pxf0ho6" name="checkbox.xml" path="/invite/component/invite/"/>
<image id="pxf0ho7" name="yqhs.png" path="/invite/image/invite/"/> <image id="pxf0ho7" name="yqhs.png" path="/invite/image/invite/"/>

2
wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png.meta
View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta
View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
assetBundleVariant: assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
View File

Binary file not shown.

2
wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0_1.png.meta
View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName: base/chat/c690b7c4ecc0dd8501b1a391699eb710
assetBundleVariant: assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 2.3 MiB

2
wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta
View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName: base/common/af187115a4824290240734622129b80b
assetBundleVariant: assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
View File

Binary file not shown.

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/401.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/e2fdc6f2928043d4d3468b2c3ef68f2d
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/402.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/dd8e326975a27b189bf300abaac8698d
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/403.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/38b6c67feb52240d5daeae8860c9d2ed
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/404.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/89ee1120b9c2b58e72bc85aeb473181c
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/501.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/40dbc86970f882d6f5a2f8711ec0ac28
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/502.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/706ecedf37c8f6e89f89f8085af9e2e0
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/503.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/5e8dea4f1206c2f86ef26c7844b70f54
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/buzhang.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/5626f27f5d019cc5fcbcfa3708b6d121
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/101.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/cfd1130710d794d8215918f51ec7c56e
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/102.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/7d5463b3d40ddfcbf35a2563017f30af
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/103.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/4667cfd6cad48a42c8dd327dd879361d
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/104.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/dc83353794d35095624e561e3ff3856e
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/105.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/d71ba308da93b3be87f1d8b7099b18f1
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/106.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/f8df23b6d09adb3013fbfadd5f2b12e7
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/107.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/1e07164c0f8eb4e1eeb76572954e24e8
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/108.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/beebbaad68b423d0388691c156679cb5
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/109.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/3bf819be3556e9584a241d99e6ea2f2a
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/201.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/86b301c98bcc9e43a0e6201bf6c59895
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/202.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/82a3380f72d5ec72d5655dfae47598ef
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/203.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/b446a57989111b0981333b2f02094bed
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/204.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/86af8a373f024115d38bf9138c6502c2
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/205.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/661f7be316d55a0e68dec6a88b729c6d
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/206.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/d1a2463c00e85731454f726b73237342
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/207.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/7005ffeec10911d294f89c042311b3a2
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/208.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/e60d72f4e4b30d070a76dab67c5df0a2
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/209.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/e85b57c88a2506fed6a02cbd8962082c
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/301.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/3a6128627d1f56a3e303e541189d0772
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/302.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/dcd52e5e5588d94c361015dd29b0ab12
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/303.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/0cfcf6e8904fb6079b720c63d030de19
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/304.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/7ff9d008494d087f9a52bc2f604f564a
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/305.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/8ed46cb6d32056db57663180d0043ccd
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/306.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/92830446bb523dd918924533f6887db4
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/307.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/f77d3b4d489adf141347a08d16096f1e
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/308.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/20898cd006f116c6fcfa1d11e537b837
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/309.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/cff4a635ab49d02d11bfabce97d157a5
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/401.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/3c041cd179a4aa3bce60467da3222ff2
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/402.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/95c92553595b87a3bb857de497ec5c21
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/403.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/f33fb9412a172e9c36bedd22e652554a
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/404.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/333e4b70a7334b39ddd55983b432198e
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/501.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/128417fea46c4678dd008a73464e9fd9
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/502.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/734ddd6bea7c5026c1cc720fd2165020
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/503.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/9037194660ca4860434143c44b7fb0e2
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/chi.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/255346a8d054488200cce7b3b5d4900d
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/gang.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/d6e8cc1b2e02b6fef35b7d7b9ba8e4ec
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/hu.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/a1294d32e6e2c54084b0f18cdf670315
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/peng.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/4158643c7cf0ba87f6a80c8b39c58ed2
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/man/zimo.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/6311019edaab1c6dcc12cf4d9294bc5a
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/401.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/081697eba6c47d4d9a23052e4e1446b6
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/402.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/ced0ba948abbb1c0fcb8cb56eb7eed94
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/404.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/4953c39400edff8c7d3b39817204f534
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/501.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/bffda68e51e4c40e5e6d94086fa2bd66
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/502.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/a3998e7e2a7d21133b93ac91ef83fe67
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/503.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/30dee632bb770a13f0dce8d977b2110b
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/chi.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/79521423807a18a5c96f97c97afbaa83
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/gang.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/9ee14d7c125a07a5a7bfc1650af22162
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/hu.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/867f4925bfc95e1a1e2b6208e716ae76
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/peng.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/b9b39f377d82258fcbfcb4ad2232ebd8
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/woman/zimo.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/06f050f3af961e997704291ee173f6a6
assetBundleVariant: assetBundleVariant:

2
wb_unity_pro/Assets/ART/base/main_majiang/sound/zimo.mp3.meta
View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: base/main_majiang/240365e132b8f9e7ec5c098d59f3100f
assetBundleVariant: assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 696 KiB

After

Width:  |  Height:  |  Size: 652 KiB

BIN
wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 2.9 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 954 KiB

After

Width:  |  Height:  |  Size: 2.2 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 559 KiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 954 KiB

After

Width:  |  Height:  |  Size: 2.2 MiB

BIN
wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes
View File

Binary file not shown.

4
wb_unity_pro/Assets/StreamingAssets/init1_1.json
View File

@ -1,9 +1,9 @@
[ [
{ {
"ver": "1.0.24", "ver": "1.0.25",
"name": "跑得快", "name": "跑得快",
"check": true, "check": true,
"version": "1.0.24", "version": "1.0.25",
"game_id": "66", "game_id": "66",
"bundle": "extend/poker/runfast" "bundle": "extend/poker/runfast"
}, },

60
wb_unity_pro/Assets/StreamingAssets/init2_1.json
View File

@ -1,109 +1,109 @@
[ [
{ {
"lua_path": "/tolua_project,/base_project,/main_project", "lua_path": "/tolua_project,/base_project,/main_project",
"ver": "1.0.26", "ver": "1.0.6",
"name": "base_script", "name": "base_script",
"check": true, "check": true,
"bundle": "base/base_script", "bundle": "base/base_script",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "common", "name": "common",
"check": true, "check": true,
"bundle": "base/common", "bundle": "base/common",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "login", "name": "login",
"check": true, "check": true,
"bundle": "base/login", "bundle": "base/login",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "lobby", "name": "lobby",
"check": true, "check": true,
"bundle": "base/lobby", "bundle": "base/lobby",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "Family", "name": "Family",
"check": true, "check": true,
"bundle": "base/Family", "bundle": "base/Family",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "chat", "name": "chat",
"check": true, "check": true,
"bundle": "base/chat", "bundle": "base/chat",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "newgroup", "name": "newgroup",
"check": true, "check": true,
"bundle": "base/newgroup", "bundle": "base/newgroup",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "rank", "name": "rank",
"check": true, "check": true,
"version": "1.0.26", "version": "1.0.6",
"bundle": "base/rank" "bundle": "base/rank"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "main_majiang", "name": "main_majiang",
"check": true, "check": true,
"version": "1.0.26", "version": "1.0.6",
"bundle": "base/main_majiang" "bundle": "base/main_majiang"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "main_poker", "name": "main_poker",
"check": true, "check": true,
"version": "1.0.26", "version": "1.0.6",
"bundle": "base/main_poker" "bundle": "base/main_poker"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "main_zipai", "name": "main_zipai",
"check": true, "check": true,
"version": "1.0.26", "version": "1.0.6",
"bundle": "base/main_zipai" "bundle": "base/main_zipai"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "static", "name": "static",
"check": true, "check": true,
"bundle": "base/static", "bundle": "base/static",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"is_res": true, "is_res": true,
"name": "embed", "name": "embed",
"check": true, "check": true,
"bundle": "base/embed", "bundle": "base/embed",
"version": "1.0.26" "version": "1.0.6"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "main_pokemajiang", "name": "main_pokemajiang",
"check": true, "check": true,
"version": "1.0.26", "version": "1.0.6",
"bundle": "base/main_pokemajiang" "bundle": "base/main_pokemajiang"
}, },
{ {
"ver": "1.0.26", "ver": "1.0.6",
"name": "main_zipaimajiang", "name": "main_zipaimajiang",
"check": true, "check": true,
"version": "1.0.26", "version": "1.0.6",
"bundle": "base/main_zipaimajiang" "bundle": "base/main_zipaimajiang"
} }
] ]

BIN
wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.25.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.26.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.25.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.26.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.25.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.26.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.25.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.26.bytes
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More