黎川胡类型和胡提示
parent
8c9abac1d2
commit
870a35a385
|
|
@ -13,7 +13,7 @@ function LoginController.new()
|
|||
end
|
||||
|
||||
local _LocalConfigAllGame = {
|
||||
10,
|
||||
10, 33,
|
||||
66, 86, 87, 88, 89
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ local _isInit = false
|
|||
|
||||
local function __new_config(data)
|
||||
local ec = reimport(data.bundle .. ".ExtendConfig")
|
||||
--print("初始化ExtendManager===>>>"..data.bundle)
|
||||
print("初始化ExtendManager===>>>" .. data.bundle)
|
||||
--pt(data)
|
||||
local config = ec.new()
|
||||
ec.game_data = data
|
||||
|
|
@ -22,8 +22,6 @@ local function __new_config(data)
|
|||
end
|
||||
|
||||
function ExtendManager.Init(game_list)
|
||||
print("==========================================================ExtendManager")
|
||||
pt(game_list)
|
||||
if _isInit then return end
|
||||
for i = 1, #game_list do
|
||||
local game = game_list[i]
|
||||
|
|
@ -35,7 +33,6 @@ end
|
|||
|
||||
-- 更新扩展玩法到最新数据
|
||||
function ExtendManager.UpdateExtend(data)
|
||||
print("==========================================xtendManager.UpdateExtend")
|
||||
if not data then return end
|
||||
local tem = _extendMap[data.game_id]
|
||||
if tem and (not GameApplication.Instance.buildApp) then
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@ function M:init(url)
|
|||
local view = self._view
|
||||
local fgCtr = ControllerManager.GetController(NewGroupController)
|
||||
|
||||
self.list_room = self._view:GetChild('list_room')
|
||||
|
||||
local createOrJoin = view:GetController('createOrJoin')
|
||||
self.familyType = view:GetController('familyType')
|
||||
local btn_close = view:GetChild('btn_close')
|
||||
|
|
@ -290,7 +288,7 @@ function M:ConnetFamilyRoom(fgCtr, id)
|
|||
end
|
||||
|
||||
function M:UpdateFamilyRoom(fgCtr, id)
|
||||
local list_room = self.list_room
|
||||
local list_room = self._view:GetChild('list_room')
|
||||
list_room:SetVirtual()
|
||||
local list_gamePlay = self._view:GetChild('list_gamePlay')
|
||||
list_gamePlay:SetVirtual()
|
||||
|
|
@ -308,26 +306,25 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
print("=========================playList,rooms")
|
||||
pt(playList)
|
||||
pt(roomList)
|
||||
local roomCtr = ControllerManager.GetController(RoomController)
|
||||
list_room.itemRenderer = function(index, obj)
|
||||
if index < #roomList then
|
||||
local newIndex = index + 1
|
||||
local config = ExtendManager.GetExtendConfig(playGameInfoTable[roomList[newIndex].pid].gameId)
|
||||
local mode = config:GetGameInfo()
|
||||
local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config)
|
||||
obj:GetChild('Label_gameRule').title = gamePlay
|
||||
-- local config = ExtendManager.GetExtendConfig(playGameInfoTable[roomList[newIndex].pid].gameId)
|
||||
-- local mode = config:GetGameInfo()
|
||||
-- local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config)
|
||||
-- obj:GetChild('Label_gameRule').title = gamePlay
|
||||
obj:GetChild('game_type').text = string.format("%s房间-%s", playGameInfoTable[roomList[newIndex].pid].name,
|
||||
roomList[newIndex].id)
|
||||
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1
|
||||
obj:GetChild('btn_joinGame').onClick:Set(function()
|
||||
ViewUtil.ShowModalWait(self._root_view, "匹配房间中", 'join_room')
|
||||
local roomCtr = ControllerManager.GetController(RoomController)
|
||||
roomCtr:PublicJoinRoom(
|
||||
Protocol.WEB_FG_JOIN_ROOM,
|
||||
roomList[newIndex].id,
|
||||
false,
|
||||
function(response)
|
||||
ViewUtil.CloseModalWait('join_room')
|
||||
if (response.ReturnCode == -1) then
|
||||
ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')
|
||||
-- RestartGame()
|
||||
return
|
||||
end
|
||||
|
|
@ -337,6 +334,8 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
-- ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
return
|
||||
else
|
||||
ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间成功')
|
||||
|
||||
ViewManager.ChangeView(ViewManager.View_Main, playGameInfoTable[roomList[newIndex].pid]
|
||||
.gameId)
|
||||
end
|
||||
|
|
@ -347,40 +346,35 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
end)
|
||||
else
|
||||
local newIndex = index - #roomList + 1
|
||||
local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId)
|
||||
print("=======================================layList[newIndex].gameId", playList[newIndex].gameId)
|
||||
local mode = config:GetGameInfo()
|
||||
local gamePlay = mode:LoadConfigToDetail(playList[newIndex].config)
|
||||
obj:GetChild('Label_gameRule').title = gamePlay
|
||||
-- local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId)
|
||||
-- local mode = config:GetGameInfo()
|
||||
-- local gamePlay = mode:LoadConfigToDetail(playList[newIndex].config)
|
||||
-- obj:GetChild('Label_gameRule').title = gamePlay
|
||||
obj:GetChild('game_type').text = playList[newIndex].name
|
||||
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0
|
||||
obj:GetChild('btn_joinGame').onClick:Set(function()
|
||||
ViewUtil.ShowModalWait(self._root_view, "匹配房间中", 'join_room')
|
||||
local roomCtr = ControllerManager.GetController(RoomController)
|
||||
fgCtr:FG_ChangeFag(id, DataManager.SelfUser.acc, 777777, function()
|
||||
roomCtr:PublicJoinRoom(
|
||||
Protocol.WEB_FG_MATCH_ROOM,
|
||||
"",
|
||||
true,
|
||||
function(response)
|
||||
ViewUtil.CloseModalWait('join_room')
|
||||
if (response.ReturnCode == -1) then
|
||||
-- RestartGame()
|
||||
return
|
||||
end
|
||||
roomCtr:PublicJoinRoom(
|
||||
Protocol.WEB_FG_MATCH_ROOM,
|
||||
"",
|
||||
true,
|
||||
function(response)
|
||||
if (response.ReturnCode == -1) then
|
||||
ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')
|
||||
-- RestartGame()
|
||||
return
|
||||
end
|
||||
|
||||
if response.ReturnCode ~= 0 then
|
||||
ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
|
||||
-- ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
return
|
||||
else
|
||||
ViewManager.ChangeView(ViewManager.View_Main, playList[newIndex].gameId)
|
||||
end
|
||||
end,
|
||||
id,
|
||||
playList[newIndex].id
|
||||
)
|
||||
end)
|
||||
if response.ReturnCode ~= 0 then
|
||||
ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
|
||||
-- ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
return
|
||||
else
|
||||
ViewManager.ChangeView(ViewManager.View_Main, playList[newIndex].gameId)
|
||||
end
|
||||
end,
|
||||
id,
|
||||
playList[newIndex].id
|
||||
)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
@ -410,8 +404,10 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
end)
|
||||
end)
|
||||
end
|
||||
print("=======================why", list_room.numItems, #playList, #roomList)
|
||||
list_room.numItems = #playList + #roomList
|
||||
local all_num = #playList + #roomList
|
||||
print("=================================================list_room", list_room, list_room.numItems, all_num)
|
||||
pt(list_room)
|
||||
list_room.numItems = all_num
|
||||
list_gamePlay.numItems = #playList + 1
|
||||
end
|
||||
|
||||
|
|
@ -537,6 +533,7 @@ function M:OnUpdate()
|
|||
self._group.update_room = false
|
||||
self._fristRoom = true
|
||||
end
|
||||
print("====================================UpdateFamilyRoom", fgCtr, self._group.id)
|
||||
self:UpdateFamilyRoom(fgCtr, self._group.id)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -98,6 +98,24 @@ function M:InitView(url)
|
|||
ViewManager.ChangeView(ViewManager.View_Family)
|
||||
end)
|
||||
|
||||
-- self.groupMainView = GroupMainView.new(self._view:GetChild("group"), self._root_view, self._view)
|
||||
-- --self.groupMainView:Show()
|
||||
|
||||
-- local btn_more_group = self._view:GetChild("btn_family")
|
||||
-- btn_more_group.onClick:Set(function()
|
||||
-- --self.groupMainView._view.visible = true
|
||||
-- ViewUtil.ShowModalWait(self._root_view, "请稍等，获取牌友圈中...")
|
||||
-- local enterGroupCallBackFunc = function(code)
|
||||
-- ViewUtil.CloseModalWait()
|
||||
-- if code == 0 then
|
||||
-- self.groupMainView._view.visible = true
|
||||
-- else
|
||||
-- ViewUtil.ErrorTip(10000000, "获取牌友圈失败，请检查网络设置！")
|
||||
-- printlog("获取圈子数据失败=======>>>>")
|
||||
-- end
|
||||
-- end
|
||||
-- self.groupMainView:Show(nil, enterGroupCallBackFunc)
|
||||
-- end)
|
||||
-- local btn_createRoom = self._view:GetChild("btn_createRoom")
|
||||
-- btn_createRoom.onClick:Add(function()
|
||||
-- local createPlayView = CreatePlayView.new()
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ require "Game.View.init"
|
|||
---
|
||||
-- a net ViewManager
|
||||
ViewManager = {
|
||||
|
||||
|
||||
View_Login = 1,
|
||||
|
||||
|
||||
View_Lobby = 2,
|
||||
|
||||
|
||||
View_Main = 3,
|
||||
|
||||
View_PlayBack = 4,
|
||||
|
|
@ -30,22 +30,22 @@ local function __NetTip(txt_msg)
|
|||
if _currenView.UnmarkSelfTuoguan then
|
||||
_currenView:UnmarkSelfTuoguan()
|
||||
end
|
||||
_curren_msg = BaseWindow.new("ui://Common/Win_ConnectTip",_currenView._root_view)
|
||||
_curren_msg = BaseWindow.new("ui://Common/Win_ConnectTip", _currenView._root_view)
|
||||
local view = _curren_msg._view
|
||||
view:GetChild("tex_message").text = txt_msg
|
||||
view:GetChild("btn_connect").onClick:Set(function()
|
||||
_curren_msg:Destroy()
|
||||
_curren_msg = nil
|
||||
NetResetConnectWindow.ShowNetReset()
|
||||
ControllerManager.reset_join_room = 0
|
||||
ControllerManager.ResetJionRoom()
|
||||
_curren_msg:Destroy()
|
||||
_curren_msg = nil
|
||||
NetResetConnectWindow.ShowNetReset()
|
||||
ControllerManager.reset_join_room = 0
|
||||
ControllerManager.ResetJionRoom()
|
||||
end)
|
||||
view:GetChild("btn_back").onClick:Set(function()
|
||||
_curren_msg:Destroy()
|
||||
_curren_msg = nil
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
ControllerManager.ChangeController(LoddyController)
|
||||
ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
_curren_msg:Destroy()
|
||||
_curren_msg = nil
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
ControllerManager.ChangeController(LoddyController)
|
||||
ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
end)
|
||||
_curren_msg._close_zone = false
|
||||
_curren_msg._animation = false
|
||||
|
|
@ -56,7 +56,7 @@ local function __OnGameConnectAction(state)
|
|||
--print("state:"..state)
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
if state == SocketCode.Connect then
|
||||
ViewManager.ChangeView(ViewManager.View_Main,DataManager.CurrenRoom.game_id)
|
||||
ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
|
||||
return
|
||||
elseif state == SocketCode.DisconnectByServer then
|
||||
__NetTip("网络断开连接！")
|
||||
|
|
@ -72,101 +72,107 @@ local function __OnGameConnectAction(state)
|
|||
end
|
||||
|
||||
function ViewManager.Init()
|
||||
_viewClassMap[ViewManager.View_Login] = LoginView
|
||||
_viewClassMap[ViewManager.View_Lobby] = LobbyView
|
||||
_viewClassMap[ViewManager.View_Family] = FamilyView
|
||||
_viewClassMap[ViewManager.View_Login] = LoginView
|
||||
_viewClassMap[ViewManager.View_Lobby] = LobbyView
|
||||
_viewClassMap[ViewManager.View_Family] = FamilyView
|
||||
|
||||
ControllerManager.OnGameConnect = __OnGameConnectAction
|
||||
ControllerManager.OnGameConnect = __OnGameConnectAction
|
||||
|
||||
ControllerManager.WebClient.holdCallback = function( response )
|
||||
if response.ReturnCode == Table_Error_code.ERR_LOGOUT then
|
||||
PlayerPrefs.DeleteKey("session_id")
|
||||
PlayerPrefs.Save()
|
||||
end
|
||||
if response.ReturnCode == -1 or response.ReturnCode == Table_Error_code.ERR_LOGOUT then
|
||||
ViewUtil.CloseModalWait()
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
RestartGame()
|
||||
return true
|
||||
end
|
||||
return false
|
||||
ControllerManager.WebClient.holdCallback = function(response)
|
||||
if response.ReturnCode == Table_Error_code.ERR_LOGOUT then
|
||||
PlayerPrefs.DeleteKey("session_id")
|
||||
PlayerPrefs.Save()
|
||||
end
|
||||
if response.ReturnCode == -1 or response.ReturnCode == Table_Error_code.ERR_LOGOUT then
|
||||
ViewUtil.CloseModalWait()
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
RestartGame()
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
function ViewManager.GetCurrenView()
|
||||
return _currenView
|
||||
return _currenView
|
||||
end
|
||||
|
||||
function ViewManager.ChangeViewByClass(dview_class,callback)
|
||||
if (_currenView ~= nil) then
|
||||
if _currenView._close_destroy then
|
||||
_currenView:Destroy()
|
||||
_viewMap[_currenView.dview_class] = nil
|
||||
else
|
||||
_currenView:Close()
|
||||
end
|
||||
if _currenView._s_callback then
|
||||
_currenView._s_callback()
|
||||
end
|
||||
function ViewManager.ChangeViewByClass(dview_class, callback)
|
||||
if (_currenView ~= nil) then
|
||||
if _currenView._close_destroy then
|
||||
_currenView:Destroy()
|
||||
_viewMap[_currenView.dview_class] = nil
|
||||
else
|
||||
_currenView:Close()
|
||||
end
|
||||
local tem = _viewMap[dview_class]
|
||||
if not tem then
|
||||
tem = dview_class.new()
|
||||
tem._s_callback = callback
|
||||
_viewMap[dview_class] = tem
|
||||
if _currenView._s_callback then
|
||||
_currenView._s_callback()
|
||||
end
|
||||
tem.Id = id
|
||||
tem.dview_class = dview_class
|
||||
tem:Show()
|
||||
_currenView = tem
|
||||
return tem
|
||||
end
|
||||
local tem = _viewMap[dview_class]
|
||||
|
||||
if not tem then
|
||||
tem = dview_class.new()
|
||||
|
||||
tem._s_callback = callback
|
||||
_viewMap[dview_class] = tem
|
||||
end
|
||||
|
||||
tem.Id = id
|
||||
tem.dview_class = dview_class
|
||||
tem:Show()
|
||||
_currenView = tem
|
||||
return tem
|
||||
end
|
||||
|
||||
local last_game_id = 0
|
||||
function ViewManager.ChangeView(id,game_id,callback)
|
||||
-- if id==2 then
|
||||
-- printlog("cccccccccccccccccccccccccccccccc")
|
||||
-- printlog(debug.traceback())
|
||||
--- end
|
||||
local dview_class = _viewClassMap[id]
|
||||
if not dview_class then
|
||||
if last_game_id ~= 0 and last_game_id ~= game_id then
|
||||
ExtendManager.GetExtendConfig(last_game_id):UnAssets()
|
||||
end
|
||||
local exconfig = ExtendManager.GetExtendConfig(game_id)
|
||||
dview_class = exconfig:GetView(id)
|
||||
last_game_id = game_id
|
||||
function ViewManager.ChangeView(id, game_id, callback)
|
||||
-- if id==2 then
|
||||
-- printlog("cccccccccccccccccccccccccccccccc")
|
||||
-- printlog(debug.traceback())
|
||||
--- end
|
||||
|
||||
local dview_class = _viewClassMap[id]
|
||||
|
||||
|
||||
if not dview_class then
|
||||
if last_game_id ~= 0 and last_game_id ~= game_id then
|
||||
ExtendManager.GetExtendConfig(last_game_id):UnAssets()
|
||||
end
|
||||
if not dview_class then
|
||||
return
|
||||
end
|
||||
return ViewManager.ChangeViewByClass(dview_class,callback)
|
||||
local exconfig = ExtendManager.GetExtendConfig(game_id)
|
||||
dview_class = exconfig:GetView(id)
|
||||
last_game_id = game_id
|
||||
end
|
||||
if not dview_class then
|
||||
return
|
||||
end
|
||||
return ViewManager.ChangeViewByClass(dview_class, callback)
|
||||
end
|
||||
|
||||
function ViewManager.OnApplicationPause()
|
||||
-- print("game pause")
|
||||
if (_currenView ~= nil) then
|
||||
if (_currenView ~= nil) then
|
||||
_currenView:OnApplicationPause()
|
||||
end
|
||||
end
|
||||
|
||||
function ViewManager.OnApplicationActive()
|
||||
-- print("game active")
|
||||
if (_currenView ~= nil) then
|
||||
if (_currenView ~= nil) then
|
||||
_currenView:OnApplicationActive()
|
||||
end
|
||||
end
|
||||
|
||||
function ViewManager.refreshGameView()
|
||||
NetResetConnectWindow.ShowNetReset()
|
||||
NetResetConnectWindow.ShowNetReset()
|
||||
|
||||
if DataManager.CurrenRoom then
|
||||
ControllerManager.reset_join_room = 0
|
||||
if DataManager.CurrenRoom then
|
||||
ControllerManager.reset_join_room = 0
|
||||
|
||||
ControllerManager.ResetJionRoom()
|
||||
else
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
ControllerManager.ChangeController(LoddyController)
|
||||
ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
end
|
||||
ControllerManager.ResetJionRoom()
|
||||
else
|
||||
NetResetConnectWindow.CloseNetReset()
|
||||
ControllerManager.ChangeController(LoddyController)
|
||||
ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ local M = {}
|
|||
|
||||
--- Create a new CS_MainView
|
||||
function M.new()
|
||||
setmetatable(M, { __index = MJMainView })
|
||||
local self = setmetatable({}, { __index = M })
|
||||
setmetatable(M,{__index = MJMainView})
|
||||
local self = setmetatable({}, {__index = M})
|
||||
self.class = "CS_MainView"
|
||||
self.asset_group = "ChangSha_MJ"
|
||||
self:init()
|
||||
|
|
@ -45,12 +45,9 @@ function M:InitView(url)
|
|||
self._gps_style = 1
|
||||
self._full = true
|
||||
-- self.Fix_Msg_Chat = Fix_Msg_Chat
|
||||
|
||||
UIPackage.AddPackage("extend/majiang/changsha/ui/Extend_MJ_ChangSha")
|
||||
if self._room.room_config.people_num == 2 then
|
||||
MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)
|
||||
else
|
||||
MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2")
|
||||
end
|
||||
MJMainView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2")
|
||||
|
||||
|
||||
|
||||
|
|
@ -114,9 +111,9 @@ function M:EventInit()
|
|||
end
|
||||
end)
|
||||
|
||||
_gamectr:AddEventListener(CS_GameEvent.SendCards, function(...)
|
||||
local arg = { ... }
|
||||
self._tex_LeftCard.text = string.format("剩余%d张牌", arg[1])
|
||||
_gamectr:AddEventListener(CS_GameEvent.SendCards,function( ... )
|
||||
local arg = {...}
|
||||
self._tex_LeftCard.text = arg[1]
|
||||
local info = self._player_card_info[1]
|
||||
info._player.auto_out_card = false
|
||||
self:UpdateRound()
|
||||
|
|
@ -126,7 +123,6 @@ function M:EventInit()
|
|||
local p = list[i]
|
||||
local info = self._player_info[self:GetPos(p.seat)]
|
||||
info:FillData(p)
|
||||
info:SetStartType(_room.room_config.people_num, p.seat)
|
||||
info:MarkBank(p.seat == _room.banker_seat)
|
||||
info:Ready(false)
|
||||
local card_info = self._player_card_info[self:GetPos(p.seat)]
|
||||
|
|
@ -188,7 +184,7 @@ function M:EventInit()
|
|||
local arg = { ... }
|
||||
local seat = arg[1]
|
||||
local card = arg[2]
|
||||
self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
|
||||
self._tex_LeftCard.text = arg[3]
|
||||
-- self:UpdateRoomInfo()
|
||||
local info = self._player_card_info[self:GetPos(seat)]
|
||||
info:UpdateHandCard(true)
|
||||
|
|
@ -348,7 +344,7 @@ function M:EventInit()
|
|||
if _room:checkHpNonnegative() then
|
||||
p.cur_hp = data[i].hp_info.cur_hp
|
||||
end
|
||||
-- info:UpdateScore()
|
||||
info:UpdateScore()
|
||||
info._view:GetChild("zhanji").visible = true
|
||||
local num = data[i].hp_info.total_hp
|
||||
if num > 0 then
|
||||
|
|
@ -455,10 +451,10 @@ function M:EventInit()
|
|||
end)
|
||||
|
||||
_gamectr:AddEventListener(CS_GameEvent.EvnetPiaoTip, function()
|
||||
self:UpdateRound()
|
||||
self._tex_LeftCard.text = "剩余0张牌"
|
||||
self._state.selectedIndex = 1
|
||||
if oldGameVersion == 1 then
|
||||
self:UpdateRound()
|
||||
self._tex_LeftCard.text = "0"
|
||||
self._state.selectedIndex = 1
|
||||
if oldGameVersion==1 then
|
||||
self:__PiaoNiaoTip()
|
||||
else
|
||||
self:__PiaoNiaoTip1()
|
||||
|
|
@ -520,13 +516,8 @@ function M:EventInit()
|
|||
end
|
||||
|
||||
function M:UpdateRound()
|
||||
if self._room.room_config.people_num == 2 then
|
||||
self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
|
||||
self._room.room_config.round)
|
||||
else
|
||||
self._view:GetChild("tex_round1").text = self._room.curren_round
|
||||
self._view:GetChild("tex_round2").text = self._room.room_config.round
|
||||
end
|
||||
self._view:GetChild("tex_round1").text = self._room.curren_round
|
||||
self._view:GetChild("tex_round2").text = self._room.room_config.round
|
||||
end
|
||||
|
||||
function M:InitPlayerInfoView()
|
||||
|
|
@ -1115,7 +1106,7 @@ function M:ReloadRoom(bskip)
|
|||
|
||||
if bskip == nil or bskip == false then
|
||||
self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
|
||||
self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
|
||||
self._tex_LeftCard.text = room.left_count
|
||||
self:UpdateRound()
|
||||
end
|
||||
local me = room.self_player
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
local PlayerInfoView_copy = require("Game.View.PlayerInfoView copy")
|
||||
local PlayerInfoView = require("Game.View.PlayerInfoView")
|
||||
|
||||
local M = {}
|
||||
|
||||
function M.new(view, mainView)
|
||||
if mainView._room.room_config.people_num == 2 then
|
||||
setmetatable(M, { __index = PlayerInfoView_copy })
|
||||
else
|
||||
setmetatable(M, { __index = PlayerInfoView })
|
||||
end
|
||||
local self = setmetatable({}, { __index = M })
|
||||
setmetatable(M, {__index = PlayerInfoView})
|
||||
local self = setmetatable({}, {__index = M})
|
||||
self._view = view
|
||||
self._main_view = mainView
|
||||
self:init()
|
||||
|
|
@ -17,14 +12,10 @@ function M.new(view, mainView)
|
|||
end
|
||||
|
||||
function M:init()
|
||||
if self._main_view._room.room_config.people_num ~= 2 then
|
||||
PlayerInfoView.init(self)
|
||||
self._tex_score = self._view:GetChild("info"):GetChild("tex_score1")
|
||||
self._tex_score2 = self._view:GetChild("info"):GetChild("tex_score2")
|
||||
self._ct_score = self._view:GetChild("info"):GetController("score")
|
||||
else
|
||||
PlayerInfoView_copy.init(self)
|
||||
end
|
||||
PlayerInfoView.init(self)
|
||||
self._tex_score = self._view:GetChild("info"):GetChild("tex_score1")
|
||||
self._tex_score2 = self._view:GetChild("info"):GetChild("tex_score2")
|
||||
self._ct_score = self._view:GetChild("info"):GetController("score")
|
||||
end
|
||||
|
||||
function M:ShowInteraction(type, str)
|
||||
|
|
@ -57,11 +48,8 @@ function M:UpdateRemainCard(card_num, hide)
|
|||
end
|
||||
|
||||
function M:FillData(player)
|
||||
if self._main_view._room.room_config.people_num == 2 then
|
||||
PlayerInfoView_copy.FillData(self, player)
|
||||
else
|
||||
|
||||
PlayerInfoView.FillData(self, player)
|
||||
end
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -32,18 +32,17 @@ local function CardPos(obj, area, oder, loc, offset)
|
|||
end
|
||||
|
||||
function M:UpdateHandCard(getcard, mp, opcard)
|
||||
print("nandaodaozhelil", 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"]
|
||||
-- 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
|
||||
|
|
@ -74,8 +73,7 @@ function M:UpdateHandCard(getcard, mp, opcard)
|
|||
if opnum ~= -1 then
|
||||
loc = CardPos(obj, self._area_handcard_list, oder, loc, offset)
|
||||
else
|
||||
print("=======zhihoudaizheli", oder)
|
||||
ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset, nil, -12)
|
||||
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
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@ local M = {}
|
|||
|
||||
--- Create a new GameController
|
||||
function M.new()
|
||||
setmetatable(M,{__index = GameController})
|
||||
local self = setmetatable({}, {__index = M})
|
||||
self:init("南城麻将")
|
||||
self.class = "TX_GameController"
|
||||
return self
|
||||
setmetatable(M, { __index = GameController })
|
||||
local self = setmetatable({}, { __index = M })
|
||||
self:init("南城麻将")
|
||||
self.class = "TX_GameController"
|
||||
return self
|
||||
end
|
||||
|
||||
function M:init(name)
|
||||
GameController.init(self,name)
|
||||
GameController.init(self, name)
|
||||
|
||||
self._eventmap[TX_Protocol.GAME_EVT_PLAYER_DEAL] = self.OnEventSendCards
|
||||
self._eventmap[TX_Protocol.GAME_EVT_PLAYER_DEAL] = self.OnEventSendCards
|
||||
self._eventmap[TX_Protocol.GAME_EVT_CHANGE_ACTIVE_PLAYER] = self.OnEventTurn
|
||||
|
||||
self._eventmap[TX_Protocol.GAME_EVT_DRAW] = self.OnEventTakeCard
|
||||
|
|
@ -36,7 +36,6 @@ function M:init(name)
|
|||
|
||||
self._eventmap[TX_Protocol.GAME_EVT_GANGZI] = self.OnEventGangCards
|
||||
self._eventmap[TX_Protocol.GAME_EVT_BUGANG] = self.OnEventBuGang
|
||||
|
||||
end
|
||||
|
||||
local __pre_delete_card = false
|
||||
|
|
@ -45,17 +44,17 @@ function M:SendOutCard(card, callback)
|
|||
local _data = {}
|
||||
_data["card"] = card
|
||||
local _room = self._room
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
_client:send(TX_Protocol.GAME_DIS_CARD, _data)
|
||||
|
||||
-- 进行预删牌处理
|
||||
local p = _room.self_player
|
||||
_room.curren_outcard_seat = -1
|
||||
list_remove(p.card_list,card)
|
||||
list_remove(p.card_list, card)
|
||||
table.sort(p.card_list, ViewUtil.HandCardSort)
|
||||
p.hand_left_count = p.hand_left_count - 1
|
||||
if not p.outcard_list then p.outcard_list = {} end
|
||||
p.outcard_list[#p.outcard_list+1] = card
|
||||
p.outcard_list[#p.outcard_list + 1] = card
|
||||
__pre_delete_card = true
|
||||
callback()
|
||||
end
|
||||
|
|
@ -63,15 +62,15 @@ end
|
|||
function M:SendGangCard(card)
|
||||
local _data = {}
|
||||
_data["card"] = card
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
_client:send(TX_Protocol.GAME_EVT_DOGANG, _data)
|
||||
end
|
||||
|
||||
|
||||
function M:OnEventGangCards(evt_data)
|
||||
printlog("OnEventGangCards")
|
||||
pt(evt_data)
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.SendGangZi,evt_data["gangzi1"],evt_data["gangzi2"],evt_data["gangnum"],true )
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.SendGangZi, evt_data["gangzi1"], evt_data["gangzi2"],
|
||||
evt_data["gangnum"], true)
|
||||
end
|
||||
|
||||
function M:OnEventBuGang(evt_data)
|
||||
|
|
@ -84,7 +83,7 @@ end
|
|||
function M:SendAction(id)
|
||||
local _data = {}
|
||||
_data["id"] = id
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
_client:send(TX_Protocol.GAME_ACTION, _data)
|
||||
end
|
||||
|
||||
|
|
@ -94,42 +93,44 @@ function M:OnEventSendCards(evt_data)
|
|||
return
|
||||
end
|
||||
|
||||
local _room = self._room
|
||||
local _room = self._room
|
||||
if not _room.room_config.piao_niao or _room.self_player.entrust then
|
||||
_room.curren_round = _room.curren_round + 1
|
||||
end
|
||||
if _room.curren_round > 0 then _room.playing = true end
|
||||
|
||||
printlog("开始发牌===========>>>")
|
||||
pt(evt_data)
|
||||
|
||||
local room = DataManager.CurrenRoom
|
||||
--printlog(evt_data.laiziCard)
|
||||
--printlog(evt_data.laiziCard2)
|
||||
--printlog(evt_data.laiziCardBefore)
|
||||
--printlog(evt_data.laiziCard2Before)
|
||||
|
||||
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.SendGangZi,102,103,0,true )
|
||||
|
||||
|
||||
|
||||
printlog("开始发牌===========>>>")
|
||||
pt(evt_data)
|
||||
|
||||
local room = DataManager.CurrenRoom
|
||||
--printlog(evt_data.laiziCard)
|
||||
--printlog(evt_data.laiziCard2)
|
||||
--printlog(evt_data.laiziCardBefore)
|
||||
--printlog(evt_data.laiziCard2Before)
|
||||
|
||||
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.SendGangZi, 102, 103, 0, true)
|
||||
|
||||
|
||||
|
||||
-- _room.SelfPlayer.AutoOutCard = false
|
||||
local handcards = evt_data["card_list"]
|
||||
local p = _room.self_player
|
||||
local seat = evt_data["bank_seat"]
|
||||
local jing = evt_data["jing"]
|
||||
self._cacheEvent:Enqueue(function()
|
||||
_room.banker_seat = seat
|
||||
for i=1,#_room.player_list do
|
||||
_room.jing = jing
|
||||
for i = 1, #_room.player_list do
|
||||
_room.player_list[i].hand_left_count = 13
|
||||
_room.player_list[i].fz_list = {}
|
||||
_room.player_list[i].card_list = {}
|
||||
end
|
||||
p.card_list = handcards
|
||||
self._room.self_player.hand_left_count = #handcards
|
||||
table.sort( handcards, ViewUtil.HandCardSort )
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.SendCards, p)
|
||||
end)
|
||||
self._room.self_player.hand_left_count = #handcards
|
||||
table.sort(handcards, ViewUtil.HandCardSort)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.SendCards, p)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:OnEventOutCard(evt_data)
|
||||
|
|
@ -138,7 +139,7 @@ function M:OnEventOutCard(evt_data)
|
|||
local ting_list = nil
|
||||
local p = self._room:GetPlayerBySeat(seat)
|
||||
self._cacheEvent:Enqueue(function()
|
||||
local _room = self._room
|
||||
local _room = self._room
|
||||
_room.last_outcard_seat = seat
|
||||
if seat == _room.self_player.seat and __pre_delete_card then
|
||||
__pre_delete_card = false
|
||||
|
|
@ -149,13 +150,12 @@ function M:OnEventOutCard(evt_data)
|
|||
end
|
||||
p.hand_left_count = p.hand_left_count - 1
|
||||
if not p.outcard_list then p.outcard_list = {} end
|
||||
p.outcard_list[#p.outcard_list+1] = card
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.OutCard, p, card)
|
||||
p.outcard_list[#p.outcard_list + 1] = card
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.OutCard, p, card)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
function M:OnEventTakeCard(evt_data)
|
||||
local _room = self._room
|
||||
local seat = evt_data["seat"]
|
||||
|
|
@ -163,19 +163,19 @@ function M:OnEventTakeCard(evt_data)
|
|||
local left_count = evt_data["left_count"]
|
||||
local p = _room:GetPlayerBySeat(seat)
|
||||
self._cacheEvent:Enqueue(function()
|
||||
p.hand_left_count = p.hand_left_count +1
|
||||
p.hand_left_count = p.hand_left_count + 1
|
||||
if (seat == _room.self_player.seat) then
|
||||
_room.self_player.card_list[#_room.self_player.card_list+1] = card
|
||||
_room.self_player.card_list[#_room.self_player.card_list + 1] = card
|
||||
-- table.sort( _room.self_player.card_list, ViewUtil.HandCardSort )
|
||||
end
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.GetCard, seat, card, left_count)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.GetCard, seat, card, left_count)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:OnEventOutHint(evt_data)
|
||||
self._cacheEvent:Enqueue(function()
|
||||
self._room.curren_outcard_seat = self._room.self_player.seat
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.OutHint)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.OutHint)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
@ -183,24 +183,24 @@ function M:OnEventTurn(evt_data)
|
|||
local seat = evt_data["seat"]
|
||||
self._cacheEvent:Enqueue(function()
|
||||
-- self._room.curren_outcard_seat = seat
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.EventTurn, seat)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.EventTurn, seat)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:OnEventFzTips(evt_data)
|
||||
self._cacheEvent:Enqueue(function()
|
||||
local tiplist = FZTipList.new()
|
||||
local list = evt_data["tip_list"]
|
||||
local list = evt_data["tip_list"]
|
||||
local weight = evt_data["weight"]
|
||||
for i=1,#list do
|
||||
local dtip = list[i]
|
||||
for i = 1, #list do
|
||||
local dtip = list[i]
|
||||
local tip = {}
|
||||
tip.id = dtip["id"]
|
||||
tip.weight = dtip["weight"]
|
||||
tip.card = dtip["card"]
|
||||
tip.type = dtip["type"]
|
||||
tip.opcard = dtip["opcard"]
|
||||
|
||||
|
||||
-- if (dtip["opcard"]) then
|
||||
-- local opcard = dtip["opcard"]
|
||||
-- tip.OpCard = opcard
|
||||
|
|
@ -209,12 +209,12 @@ function M:OnEventFzTips(evt_data)
|
|||
-- end
|
||||
tiplist:AddTip(tip)
|
||||
end
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.FZTips, tiplist, weight)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.FZTips, tiplist, weight)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:OnEventFzAction(evt_data)
|
||||
local _room = self._room
|
||||
local _room = self._room
|
||||
local playerid = evt_data["playerid"]
|
||||
local card = evt_data["card"]
|
||||
local actice_card = evt_data["active_card"]
|
||||
|
|
@ -229,12 +229,12 @@ function M:OnEventFzAction(evt_data)
|
|||
local index = -1
|
||||
local ftype = type
|
||||
if (ftype == FZType.Gang_Peng) then
|
||||
for i=1,#p.fz_list do
|
||||
for i = 1, #p.fz_list do
|
||||
if (p.fz_list[i].card == card) then
|
||||
p.fz_list[i].card = card
|
||||
fz = p.fz_list[i]
|
||||
fz.type = type
|
||||
index = i -1
|
||||
index = i - 1
|
||||
break
|
||||
end
|
||||
end
|
||||
|
|
@ -245,45 +245,46 @@ 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
|
||||
p.fz_list[#p.fz_list + 1] = fz
|
||||
end
|
||||
fz.from_seat = from_seat
|
||||
local remove_num = #opcard
|
||||
|
||||
if (p == _room.self_player) then
|
||||
for i=1,remove_num do
|
||||
list_remove(p.card_list,opcard[i])
|
||||
end
|
||||
for i = 1, remove_num do
|
||||
list_remove(p.card_list, opcard[i])
|
||||
end
|
||||
end
|
||||
|
||||
p.hand_left_count = p.hand_left_count - remove_num
|
||||
if from_seat ~= p.seat then
|
||||
-- if (fz.Type == FZType.Chi) then card = actice_card end
|
||||
local fp = _room:GetPlayerBySeat(from_seat)
|
||||
table.remove(fp.outcard_list,#fp.outcard_list)
|
||||
table.remove(fp.outcard_list, #fp.outcard_list)
|
||||
end
|
||||
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.FangziAction, fz, p, index)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.FangziAction, fz, p, index)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:OnEventHu(evt_data)
|
||||
local cards = evt_data["card"]
|
||||
local cards = evt_data["card"]
|
||||
local win_p = self._room:GetPlayerBySeat(evt_data["seat"])
|
||||
local lose_p = self._room:GetPlayerBySeat(evt_data["from_seat"])
|
||||
local win_card = evt_data["win_card"]
|
||||
local win_list = evt_data["win_list"]
|
||||
|
||||
|
||||
self._cacheEvent:Enqueue(function()
|
||||
win_p.card_list = cards
|
||||
table.sort( win_p.card_list, ViewUtil.HandCardSort)
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.ZPHuCard, evt_data["seat"], evt_data["from_seat"], win_card, cards, win_list)
|
||||
table.sort(win_p.card_list, ViewUtil.HandCardSort)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.ZPHuCard, evt_data["seat"], evt_data["from_seat"], win_card, cards,
|
||||
win_list)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
@ -302,15 +303,15 @@ function M:OneventResult1(evt_data)
|
|||
p.hand_left_count = 0
|
||||
p.outcard_list = {}
|
||||
end
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.ZPResult1, result);
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.ZPResult1, result);
|
||||
end)
|
||||
elseif 1 == over or 2 == over then
|
||||
DataManager.CurrenRoom.Over = true
|
||||
ControllerManager.SetGameNetClient(nil,true)
|
||||
ControllerManager.SetGameNetClient(nil, true)
|
||||
local total_result = evt_data.total_result
|
||||
local result = evt_data.result
|
||||
self._cacheEvent:Enqueue(function()
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.ZPResult2, result, total_result, over);
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.ZPResult2, result, total_result, over);
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
@ -318,13 +319,13 @@ end
|
|||
-- function M:OnEventResult2(evt_data)
|
||||
-- DataManager.CurrenRoom.Over = true
|
||||
-- ControllerManager.SetGameNetClient(nil,true)
|
||||
-- local info_list = evt_data["info_list"]
|
||||
-- if self._result ~= nil then
|
||||
-- self._cacheEvent:Enqueue(function()
|
||||
-- self:OneventResult1(self._result)
|
||||
-- self._result = nil
|
||||
-- end)
|
||||
-- end
|
||||
-- local info_list = evt_data["info_list"]
|
||||
-- if self._result ~= nil then
|
||||
-- self._cacheEvent:Enqueue(function()
|
||||
-- self:OneventResult1(self._result)
|
||||
-- self._result = nil
|
||||
-- end)
|
||||
-- end
|
||||
-- self._cacheEvent:Enqueue(function()
|
||||
-- DispatchEvent(self._dispatcher,TX_GameEvent.ZPResult2, info_list)
|
||||
-- ControllerManager.ChangeController(LoddyController)
|
||||
|
|
@ -335,7 +336,7 @@ function M:OnEventNiao(evt_data)
|
|||
local list = evt_data["niao"]
|
||||
local start_seat = evt_data["start_seat"]
|
||||
self._cacheEvent:Enqueue(function()
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.EventNiao, list, start_seat)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.EventNiao, list, start_seat)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
@ -346,41 +347,41 @@ function M:OnEventPiaoTip()
|
|||
end
|
||||
|
||||
self._cacheEvent:Enqueue(function()
|
||||
if not self._room._reload_flag then
|
||||
if not self._room._reload_flag then
|
||||
self._room.curren_round = self._room.curren_round + 1
|
||||
end
|
||||
self._room.playing = true
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.EvnetPiaoTip, evt_data)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.EvnetPiaoTip, evt_data)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:OnEventPiao(evt_data)
|
||||
self._cacheEvent:Enqueue(function()
|
||||
DispatchEvent(self._dispatcher,TX_GameEvent.EvnetPiao, evt_data.seat, evt_data.num)
|
||||
DispatchEvent(self._dispatcher, TX_GameEvent.EvnetPiao, evt_data.seat, evt_data.num)
|
||||
end)
|
||||
end
|
||||
|
||||
function M:GetPosString( seat )
|
||||
if DataManager.CurrenRoom.room_config.people_num ~= 4 then return"" end
|
||||
if seat == 1 then
|
||||
return "北"
|
||||
elseif seat == 2 then
|
||||
return "西"
|
||||
elseif seat == 3 then
|
||||
return "南"
|
||||
elseif seat == 4 then
|
||||
return "东"
|
||||
end
|
||||
function M:GetPosString(seat)
|
||||
if DataManager.CurrenRoom.room_config.people_num ~= 4 then return "" end
|
||||
if seat == 1 then
|
||||
return "北"
|
||||
elseif seat == 2 then
|
||||
return "西"
|
||||
elseif seat == 3 then
|
||||
return "南"
|
||||
elseif seat == 4 then
|
||||
return "东"
|
||||
end
|
||||
end
|
||||
|
||||
function M:Discard(card)
|
||||
local _data = {}
|
||||
local _data = {}
|
||||
_data["card"] = card
|
||||
local _room = self._room
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
local _client = ControllerManager.GameNetClinet
|
||||
-- list_remove(_room.SelfPlayer.Cards,card)
|
||||
-- table.sort(_room.SelfPlayer.Cards)
|
||||
_client:send(Protocol.Game_Da, _data)
|
||||
end
|
||||
|
||||
return M
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -42,6 +42,11 @@ function M:InitView(url)
|
|||
self.Laizi2Btn.visible = true
|
||||
self.bugangnum = self._view:GetChild("bugangnum")
|
||||
|
||||
if room.jing then
|
||||
self.jing = self._view:GetChild('jing')
|
||||
self.jing.visible = true
|
||||
end
|
||||
|
||||
self:PlayerChangeLineState()
|
||||
|
||||
if room.playing or room.curren_round > 0 then
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
local PlayerInfoView = require("Game.View.PlayerInfoView")
|
||||
local PlayerInfoView_copy = require("Game.View.PlayerInfoView copy")
|
||||
local PlayerInfoView_copy = require("Game.View.PlayerInfoView_copy")
|
||||
|
||||
local M = {}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,40 +1,15 @@
|
|||
local CS_Win_Type = {
|
||||
"点炮",
|
||||
"自摸",
|
||||
"十三烂",
|
||||
"七星十三烂",
|
||||
"碰碰胡",
|
||||
"七小对",
|
||||
"天胡",
|
||||
"地胡",
|
||||
"平胡",
|
||||
"小七对",
|
||||
"一般高",
|
||||
"七星",
|
||||
"龙夹背",
|
||||
"清大对",
|
||||
"七星一般高",
|
||||
"双龙夹背",
|
||||
"三龙夹背",
|
||||
"十老头",
|
||||
"塘子十三ㄠ",
|
||||
"塘子小七对",
|
||||
"大对子",
|
||||
"烂牌",
|
||||
"一条龙",
|
||||
"落地龙",
|
||||
"混一色",
|
||||
"庄家",
|
||||
"清一色",
|
||||
"字一色",
|
||||
"德国",
|
||||
"抢杠胡",
|
||||
"杠上开花",
|
||||
"杠上炮",
|
||||
"双杠花",
|
||||
"双杠上炮",
|
||||
"三杠花",
|
||||
"三杠上炮",
|
||||
"四杠花",
|
||||
"四杠上炮",
|
||||
"塘子七星",
|
||||
"塘子一般高",
|
||||
"塘子七星一般高",
|
||||
"塘子烂牌",
|
||||
"闲家",
|
||||
"塘子胡",
|
||||
"杠上花",
|
||||
}
|
||||
return CS_Win_Type
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,11 @@ function M:InitView(url)
|
|||
self.Laizi2Btn.visible = true
|
||||
self.bugangnum = self._view:GetChild("bugangnum")
|
||||
|
||||
if room.jing then
|
||||
self.jing = self._view:GetChild('jing')
|
||||
self.jing.visible = true
|
||||
end
|
||||
|
||||
self:PlayerChangeLineState()
|
||||
|
||||
if room.playing or room.curren_round > 0 then
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
local PlayerInfoView = require("Game.View.PlayerInfoView")
|
||||
local PlayerInfoView_copy = require("Game.View.PlayerInfoView copy")
|
||||
local PlayerInfoView_copy = require("Game.View.PlayerInfoView_copy")
|
||||
|
||||
local M = {}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 09e5f1f2046e1f1488844d5aedf3e016
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 224 KiB |
|
|
@ -0,0 +1,140 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 200630aff1b5f2444a1bdc6d82042cdd
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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: 1
|
||||
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: 2
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
applyGammaDecoding: 1
|
||||
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: 1
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 1
|
||||
- serializedVersion: 3
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 1
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 1
|
||||
- serializedVersion: 3
|
||||
buildTarget: Windows Store Apps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 1
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: base/lobby/bfa2f8e8a7a45399d8fd309acd4f9606
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ba5d6ab72bb05904e9397b846fc8b1f3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fb4eec48dd4c2794cbc69296b5e20fe3
|
||||
folderAsset: yes
|
||||
timeCreated: 1550048807
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
|
|
@ -0,0 +1,98 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 77102410aabdeef448ff19a968dd3db6
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -3
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: -1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
textureFormat: 4
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
- buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Windows Store Apps
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ecf117c1ab207bc4eb52216ee3ce537e
|
||||
timeCreated: 1550048927
|
||||
licenseType: Pro
|
||||
TextScriptImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 95a8032caa2d0da4ab727b507078cb19
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4091776cc8b9c6248a48a1fc459b82c6
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/ebd4405ddb092f2cd9ddbc23b268a3a7
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e2039d625a5029742b5fd243afff8783
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/bbc0156ea1265e7d4f602c7e1f53b1fc
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e8380c4d973d820419a2baa1f45c6a4d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/a81a87da9eced118ad5c279edec7a65d
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c09ad59577535d440a45f395cdeb813f
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/41b7bc8deb264f5c7340db25beb0a420
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b5e3f32008794d34fb7643b48134c8ff
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/a9fec591caaeb368d16854e43a689615
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 12810792e1bf14844a92d69d3fbb1566
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/dc8c9d8e4838cde53ce6a9a9e71aee37
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d4cc134bef0f5d74090bd291f6c39260
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/bb7fe008fb12cf4054cd524df9dd96ec
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f3db1d60ef1722e42ba7f3c9cef9869c
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/f0da863240c4e3e9f8a6a6fabc5fa310
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e01c760b3ddfbb9449eb4a0e1f793367
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/f0c5046cf008d25055114d0678aa7615
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fb4f2d20e5b81744d9f4c0efa10a44e4
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/6a77a803a9818b69cffbacad12a002c9
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6d27de53f91f74e449bb9b0e752704ee
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/0d78344975c7f61bb533a220ca9cefd6
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ad0725f1318f99744af90e3f69e26038
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/577d3a9dbc42d1f52b1e585b64543bee
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d2ad35655a9c60a4a97b3d501bde0275
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/cf21143a80ac896d123a1ddbab9bb612
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 546580dde56f3ab4394590096222a10c
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/aca9fb5eb1a440e47ea2acd316ae6c9f
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3abcc2831b9a37246ae62478406720ac
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/0066d22a5d972513c84f0c7a58b2bf39
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dd7e1613c0a926547b4c1aa8306504fe
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/c999be89170b4391b90b913dae150088
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 844e1e15cd8ca5b4fbe4794e52fc6b84
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/7d3d86f2f120c859036adc4bf8eb819a
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 446d9ce48b6bea943998a4f0812c0d48
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/b02c1c0206ca1c2c28f5f2772445377d
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: de97feda2db6e5a44804513269adad2d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/bf7840729cde947d5c6cde98fea98652
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9d43e14f6cafe55468ef38e444bef1c3
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/7dcf50c9911f2a362c7e7b3159b2893b
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9af802128c30cff4a9d2270f5da23899
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/7ffa68b97a3fcda86cb5f85b912558aa
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3e8b8df635dc0eb4583f9313daaa7a2d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/5b5c61eefc2e75d9b55db6232e982d63
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ccec79694b55c624d9af3d7b5a726abc
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/4496058b3bff9f56e631860a48dfdd73
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f5da9aa53f09a9241a2cf8d369f99a1a
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/4797a7fcb16b7abb95c4527f44ed4207
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e5d1dec14307e0249ab83806f26f9692
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/5cb89f9fd2f2b922fda4fbeaf5834509
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3d2fa35a2d47dd343a7873f2027c0078
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/f5294baf7604a36441edf1b56f498f97
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3a40deede85c0d342b3640afdc5c72fd
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/39f25c9d160274ed4f71088824e20d43
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: aaa2ec7272a22d74aa714f1b3c8d1c95
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/cde05fbfd0539833668be846d66cc83a
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 05b795a55d8a716418a5cba0561179ee
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/4ffd180333440e19d7678f68b9ea721e
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c9ff72865a1aa544e9c0d449f492b7f0
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/ebfa5c62aaf2e351604109b139466639
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 426590fc92efc4941a0f67e050316a48
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/0fe29e1c8680fcb4f63192e8ae06eebd
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a8e5919aa47460a419178031ec12c63d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/3290bce82c9657d6d271b7d2faf665bf
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e6741cf447258de4bb63e783715ff7a0
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/a5f96cfa8b5759a7a78382181a3ce3b3
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 80333f4c2b85ee34381d7b72a38a268d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/8265a94ca0a64bb63edd07cdbc691c84
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d290249d66edfcd4f89721401849d467
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/c53fd1198b5f09b76e43d57965ce8aee
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7abcb2e170268e845aa269622f0de51b
|
||||
folderAsset: yes
|
||||
timeCreated: 1504147675
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cfb6556c223410f4d882e42f27ee4fc4
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: base/main_majiang/cfd1130710d794d8215918f51ec7c56e
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue