再同步一下
罗家炜
parent
df16dcc72f
commit
ba69d4899f
|
|
@ -222,7 +222,8 @@ local witness_room_frame = 0
|
|||
---@param roomid number 房间号
|
||||
---@param group_id number 亲友圈id
|
||||
---@param callback function 回调函数
|
||||
function M:PublicWitnessRoom(cmd, roomid, group_id, callback)
|
||||
---@param game_id number 游戏id
|
||||
function M:PublicWitnessRoom(cmd, roomid, group_id, callback, game_id, pid)
|
||||
printlog("公共观战房间接口=============PublicWitnessRoom")
|
||||
-- 同一帧不重复调用
|
||||
local last_frame = witness_room_frame
|
||||
|
|
@ -243,37 +244,21 @@ function M:PublicWitnessRoom(cmd, roomid, group_id, callback)
|
|||
pt(res)
|
||||
if (res.ReturnCode == 0) then
|
||||
local json = res.Data
|
||||
local game_info = json["game_info"]
|
||||
pt(game_info)
|
||||
if ExtendHotupdate.CheckVersion(game_info) ~= ExtendHotupdate.VERSION_NORMAL then
|
||||
ExtendHotupdate.UpdateGame(game_info, function()
|
||||
res.ReturnCode = -2
|
||||
callback(res)
|
||||
end)
|
||||
return
|
||||
end
|
||||
local game_id = game_info.game_id
|
||||
local server_ip = json["server_ip"]
|
||||
local server_port = json["server_port"]
|
||||
|
||||
local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
|
||||
room.lev = json["lev"] -- 自己在当前房间所在圈子的职位，1盟主，2管理员，3用户，非圈子房间就是3
|
||||
room.room_id = json["room_id"]
|
||||
room.room_id = roomid
|
||||
room.game_id = game_id
|
||||
room.status = json["status"]
|
||||
room.server_host = string.concat(server_ip, ":", server_port)
|
||||
room.session = _client:getSession()
|
||||
-- 圈子信息，圈子id和玩法id
|
||||
room.group_id = json["groupId"]
|
||||
room.group_id = group_id
|
||||
-- 圈子禁止文字聊天，禁止语音聊天
|
||||
room.ban_chat1 = json["ban_chat1"]
|
||||
room.ban_chat2 = json["ban_chat2"]
|
||||
room.ban_chat1 = 0
|
||||
room.ban_chat2 = 0
|
||||
-- 玩法id
|
||||
room.play_id = json["pid"]
|
||||
-- 体力值开关
|
||||
room.hpOnOff = json["hpOnOff"]
|
||||
-- 体力值倍数
|
||||
room.score_times = d2ad(json.hp_times) or 1
|
||||
room.play_id = pid
|
||||
DataManager.CurrenRoom = room
|
||||
local j_data = {}
|
||||
if not DataManager.SelfUser.location then
|
||||
|
|
@ -281,33 +266,33 @@ function M:PublicWitnessRoom(cmd, roomid, group_id, callback)
|
|||
end
|
||||
j_data["pos"] = DataManager.SelfUser.location:Location2String()
|
||||
printlog("++++++++++++++++++++++++++++++++++++++++++")
|
||||
-- __ConntectGameServer(Protocol.GAME_JOIN_ROOM, room, room.server_host, j_data, function(res1)
|
||||
-- printlog("===============================-------------")
|
||||
-- pt(res1)
|
||||
-- ControllerManager.IsSendCard = false
|
||||
-- if (res1.ReturnCode ~= 0) then
|
||||
-- if (callback) then callback(res1) end
|
||||
-- else
|
||||
-- -- ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData
|
||||
-- -- local _s2croom = res1.Data
|
||||
-- -- room.owner_id = _s2croom["owner"]
|
||||
-- -- if _s2croom.createTime then
|
||||
-- -- room.create_time = _s2croom["createTime"]
|
||||
-- -- end
|
||||
-- -- if _s2croom.manor then
|
||||
-- -- room.banker_seat = _s2croom.manor
|
||||
-- -- end
|
||||
-- -- room.agent = _s2croom.agent == 1 and true or false
|
||||
-- -- -- ControllerManager.SetGameNetClient(game_net)
|
||||
-- -- local extend = ExtendManager.GetExtendConfig(room.game_id)
|
||||
-- -- extend:FillRoomData(_s2croom)
|
||||
-- -- ControllerManager.ChangeController(GameController)
|
||||
-- -- local gamectr = ControllerManager.GetCurrenController()
|
||||
-- -- gamectr.tmpRoomID = room.room_id
|
||||
-- -- gamectr.tmpGroupID = room.group_id
|
||||
-- -- if callback then callback(res1) end
|
||||
__ConntectGameServer(Protocol.GAME_WITNESS_ROOM, room, room.server_host, j_data, function(res1)
|
||||
printlog("===============================-------------")
|
||||
pt(res1)
|
||||
ControllerManager.IsSendCard = false
|
||||
if (res1.ReturnCode ~= 0) then
|
||||
if (callback) then callback(res1) end
|
||||
else
|
||||
-- ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData
|
||||
-- local _s2croom = res1.Data
|
||||
-- room.owner_id = _s2croom["owner"]
|
||||
-- if _s2croom.createTime then
|
||||
-- room.create_time = _s2croom["createTime"]
|
||||
-- end
|
||||
-- end)
|
||||
-- if _s2croom.manor then
|
||||
-- room.banker_seat = _s2croom.manor
|
||||
-- end
|
||||
-- room.agent = _s2croom.agent == 1 and true or false
|
||||
-- -- ControllerManager.SetGameNetClient(game_net)
|
||||
-- local extend = ExtendManager.GetExtendConfig(room.game_id)
|
||||
-- extend:FillRoomData(_s2croom)
|
||||
-- ControllerManager.ChangeController(GameController)
|
||||
-- local gamectr = ControllerManager.GetCurrenController()
|
||||
-- gamectr.tmpRoomID = room.room_id
|
||||
-- gamectr.tmpGroupID = room.group_id
|
||||
-- if callback then callback(res1) end
|
||||
end
|
||||
end)
|
||||
else
|
||||
if callback then callback(res) end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -199,7 +199,8 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
list_room.itemRenderer = function(index, obj)
|
||||
if index < #roomList then
|
||||
local newIndex = index + 1
|
||||
local config = ExtendManager.GetExtendConfig(playGameInfoTable[roomList[newIndex].pid].gameId)
|
||||
local gameId = playGameInfoTable[roomList[newIndex].pid].gameId
|
||||
local config = ExtendManager.GetExtendConfig(gameId)
|
||||
local mode = config:GetGameInfo()
|
||||
local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config)
|
||||
obj:GetChild('Label_gameRule').title = gamePlay
|
||||
|
|
@ -233,8 +234,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
-- ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
return
|
||||
else
|
||||
ViewManager.ChangeView(ViewManager.View_Main, playGameInfoTable[roomList[newIndex].pid]
|
||||
.gameId)
|
||||
ViewManager.ChangeView(ViewManager.View_Main, gameId)
|
||||
end
|
||||
end,
|
||||
id,
|
||||
|
|
@ -258,10 +258,11 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
-- ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
return
|
||||
else
|
||||
ViewManager.ChangeView(ViewManager.View_Main, playGameInfoTable[roomList[newIndex].pid]
|
||||
.gameId)
|
||||
end
|
||||
ViewManager.ChangeView(ViewManager.View_Main, gameId)
|
||||
end
|
||||
end,
|
||||
gameId,
|
||||
roomList[newIndex].pid
|
||||
)
|
||||
-- self._gamectr = ControllerManager.GetController(GameController)
|
||||
-- self._gamectr:WitnessGame(DataManager.SelfUser.account_id, id, roomList[newIndex].id)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="1500,876" opaque="false">
|
||||
<controller name="tab" pages="0,,1,,2," selected="0"/>
|
||||
<controller name="tab" pages="0,,1,,2," selected="1"/>
|
||||
<controller name="sdk" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<component id="n58_h1uu" name="n58" src="eeqmcgu" fileName="Win_Frame_full.xml" pkg="27vd145b" xy="0,0" size="1500,876" controller="show_line,1,show_di,1,style,1">
|
||||
|
|
@ -12,42 +12,20 @@
|
|||
<image id="n72_hr0l" name="n72" src="o8k8am" fileName="images/jiangxi/Group 542.png" xy="0,0"/>
|
||||
<image id="n74_o8k8" name="n74" src="o8k8ar" fileName="images/jiangxi/Frame 27.png" xy="30,30"/>
|
||||
<image id="n73_hr0l" name="n73" src="o8k8ao" fileName="images/jiangxi/Rectangle 232.png" xy="78,243" size="1344,579"/>
|
||||
<list id="n52" name="lit_biaoqing1" xy="93,-584" size="541,439" layout="flow_hz" lineGap="5" colGap="10" lineItemCount="6" defaultItem="ui://l0ds4ys6h1uu1v" renderOrder="descent">
|
||||
<gearDisplay controller="tab" pages="0"/>
|
||||
<gearXY controller="sdk" pages="0,1" values="93,-584|302,58"/>
|
||||
<item icon="ui://l0ds4ys6h1uu6" name="101"/>
|
||||
<item icon="ui://l0ds4ys6h1uu7" name="102"/>
|
||||
<item icon="ui://l0ds4ys6h1uu8" name="103"/>
|
||||
<item icon="ui://l0ds4ys6h1uu9" name="104"/>
|
||||
<item icon="ui://l0ds4ys6h1uua" name="105"/>
|
||||
<item icon="ui://l0ds4ys6h1uub" name="106"/>
|
||||
<item icon="ui://l0ds4ys6h1uuc" name="107"/>
|
||||
<item icon="ui://l0ds4ys6h1uud" name="108"/>
|
||||
<item icon="ui://l0ds4ys6h1uue" name="109"/>
|
||||
<item icon="ui://l0ds4ys6h1uuf" name="110"/>
|
||||
<item icon="ui://l0ds4ys6h1uug" name="111"/>
|
||||
<item icon="ui://l0ds4ys6h1uuh" name="112"/>
|
||||
<item icon="ui://l0ds4ys6h1uui" name="113"/>
|
||||
<item icon="ui://l0ds4ys6h1uuj" name="114"/>
|
||||
<item icon="ui://l0ds4ys6h1uuk" name="115"/>
|
||||
<item icon="ui://l0ds4ys6h1uul" name="116"/>
|
||||
<item icon="ui://l0ds4ys6h1uum" name="117"/>
|
||||
<item icon="ui://l0ds4ys6h1uun" name="118"/>
|
||||
<item icon="ui://l0ds4ys6h1uuo" name="119"/>
|
||||
<item icon="ui://l0ds4ys6h1uup" name="120"/>
|
||||
<item icon="ui://l0ds4ys6h1uuq" name="121"/>
|
||||
<item icon="ui://l0ds4ys6h1uur" name="122"/>
|
||||
<item icon="ui://l0ds4ys6h1uus" name="123"/>
|
||||
<item icon="ui://l0ds4ys6h1uut" name="124"/>
|
||||
<item icon="ui://l0ds4ys6h1uuu" name="125"/>
|
||||
<item icon="ui://l0ds4ys6h1uuv" name="126"/>
|
||||
<item icon="ui://l0ds4ys6h1uuw" name="127"/>
|
||||
<item icon="ui://l0ds4ys6h1uux" name="128"/>
|
||||
<item icon="ui://l0ds4ys6h1uuy" name="129"/>
|
||||
<item icon="ui://l0ds4ys6h1uuz" name="130"/>
|
||||
<list id="n52" name="lit_biaoqing1" xy="81,302" size="1339,522" layout="flow_hz" lineGap="5" colGap="10" lineItemCount="4" defaultItem="ui://l0ds4ys6h1uu1v" renderOrder="descent">
|
||||
<gearDisplay controller="tab" pages="1"/>
|
||||
<gearXY controller="sdk" pages="0,1" values="81,302|302,58"/>
|
||||
<item icon="ui://l0ds4ys6o8k8bl"/>
|
||||
<item icon="ui://l0ds4ys6o8k8bm"/>
|
||||
<item icon="ui://l0ds4ys6o8k8bn"/>
|
||||
<item icon="ui://l0ds4ys6o8k8bo"/>
|
||||
<item icon="ui://l0ds4ys6o8k8bp"/>
|
||||
<item icon="ui://l0ds4ys6o8k8bq"/>
|
||||
<item icon="ui://l0ds4ys6o8k8br"/>
|
||||
<item icon="ui://l0ds4ys6o8k8bs"/>
|
||||
</list>
|
||||
<list id="n53" name="lit_yuyin" xy="762,-511" size="553,352" overflow="scroll" lineGap="10" defaultItem="ui://l0ds4ys6h1uu1t" autoItemSize="false">
|
||||
<gearDisplay controller="sdk" pages="0"/>
|
||||
<list id="n53" name="lit_yuyin" xy="81,306" size="1341,516" overflow="scroll" lineGap="10" defaultItem="ui://l0ds4ys6h1uu1t" autoItemSize="false">
|
||||
<gearDisplay controller="tab" pages="0"/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
|
|
@ -73,13 +51,13 @@
|
|||
<gearDisplay controller="sdk" pages="0"/>
|
||||
</group>
|
||||
<component id="n76_o8k8" name="text" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="78,204">
|
||||
<Button title="常用语" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap"/>
|
||||
<Button title="常用语" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="0"/>
|
||||
</component>
|
||||
<component id="n77_o8k8" name="image" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="972,204">
|
||||
<Button title="表情" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap"/>
|
||||
<Button title="表情" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="2"/>
|
||||
</component>
|
||||
<component id="n78_o8k8" name="history" src="o8k8at" fileName="images/jiangxi/btn_textMul.xml" xy="526,204">
|
||||
<Button title="聊天记录" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap"/>
|
||||
<Button checked="true" title="聊天记录" icon="ui://l0ds4ys6o8k8aq" selectedIcon="ui://l0ds4ys6o8k8ap" controller="tab" page="1"/>
|
||||
</component>
|
||||
</displayList>
|
||||
<customProperty target="text2" propertyId="0" label="111"/>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="550,62" pivot="0.5,0.5" extention="Button">
|
||||
<component size="1334,95" pivot="0.5,0.5" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down" selected="0"/>
|
||||
<displayList>
|
||||
<text id="n1" name="title" xy="8,2" size="532,57" font="FZHei-B01S" fontSize="24" color="#ffffff" vAlign="middle" letterSpacing="-1" autoSize="none" singleLine="true" text="你太牛了">
|
||||
<text id="n1" name="title" xy="1,0" size="1334,95" font="ui://27vd145bh35o7il1" fontSize="60" color="#4d2605" vAlign="middle" letterSpacing="-1" autoSize="shrink" singleLine="true" text="你太牛了">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</text>
|
||||
</displayList>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="82,82" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down" selected="1"/>
|
||||
<component size="334,261" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down" selected="0"/>
|
||||
<displayList>
|
||||
<graph id="n2_h1uu" name="n2" xy="-4,-4" size="90,90" type="rect" lineSize="0" fillColor="#ffe97302">
|
||||
<graph id="n2_h1uu" name="n2" xy="-4,-4" size="90,90" visible="false" type="rect" lineSize="0" fillColor="#ffe97302">
|
||||
<gearDisplay controller="button" pages="1,2"/>
|
||||
</graph>
|
||||
<loader id="n1" name="icon" xy="0,0" size="82,82" url="ui://l0ds4ys6h1uu1a" align="center" vAlign="middle"/>
|
||||
<loader id="n1" name="icon" xy="34,40" size="258,174" url="ui://l0ds4ys6h1uu1a" align="center" vAlign="middle" fill="scale">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
</displayList>
|
||||
<Button/>
|
||||
</component>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -210,6 +210,14 @@
|
|||
<image id="o8k8ar" name="Frame 27.png" path="/images/jiangxi/"/>
|
||||
<component id="o8k8as" name="btn_normol.xml" path="/component/"/>
|
||||
<component id="o8k8at" name="btn_textMul.xml" path="/images/jiangxi/"/>
|
||||
<movieclip id="o8k8bl" name="1.jta" path="/images/jiangxi/face/"/>
|
||||
<movieclip id="o8k8bm" name="2.jta" path="/images/jiangxi/face/"/>
|
||||
<movieclip id="o8k8bn" name="3.jta" path="/images/jiangxi/face/"/>
|
||||
<movieclip id="o8k8bo" name="4.jta" path="/images/jiangxi/face/"/>
|
||||
<movieclip id="o8k8bp" name="5.jta" path="/images/jiangxi/face/"/>
|
||||
<movieclip id="o8k8bq" name="6.jta" path="/images/jiangxi/face/"/>
|
||||
<movieclip id="o8k8br" name="7.jta" path="/images/jiangxi/face/"/>
|
||||
<movieclip id="o8k8bs" name="8.jta" path="/images/jiangxi/face/"/>
|
||||
</resources>
|
||||
<publish name="Chat" path="..\wb_unity_pro\Assets\ART\base\chat\ui" packageCount="2">
|
||||
<atlas name="默认" index="0"/>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 574 KiB After Width: | Height: | Size: 792 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 335 KiB |
|
|
@ -0,0 +1,92 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c3ae9fff9ffd74b4eaba06864d076838
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: -1
|
||||
wrapV: -1
|
||||
wrapW: -1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Loading…
Reference in New Issue