lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步

master
罗家炜 2025-11-08 13:40:27 +08:00
parent a0867973dd
commit d28814cea3
25 changed files with 169 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,13 +384,20 @@ function M:_evtOnFamilyMemberOut(...)
local reflashType = arg.reflashType
local group = DataManager.groups:get(groupId)
local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
tips = string.format(tips, DataManager.SelfUser.nick_name, DataManager.SelfUser.account_id, group.name, groupId)
local view = ViewManager.GetCurrenView()
if view.class ~= "FamilyMainView" or not group then
return
end
local tips = ""
if name == group.name then
tips = "【%s(%s)】亲友圈已解散"
tips = string.format(tips, group.name, groupId)
else
tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
tips = string.format(tips, DataManager.SelfUser.nick_name, DataManager.SelfUser.account_id, group.name, groupId)
end
if uid == DataManager.SelfUser.account_id then
DataManager.groups:del(groupId)
if #DataManager.groups.groupList == 0 then

14
lua_probject/base_project/Game/View/Family/FamilyMsgDiamond.lua
View File

@ -38,10 +38,16 @@ function M:Init()
end
function M:msgRenderer(index, obj)
local data = self.msgData
obj:GetChild('tex_time').text = os.date("%Y-%m-%d %H:%M:%S", math.floor(data[index + 1].m_time / 1000))
obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data[index + 1].diamo_type + 1],
data[index + 1].diamo_num, data[index + 1].diamo_cur)
local data = self.msgData[index + 1]
local type = data.diamo_type
obj:GetChild('tex_time').text = os.date("%Y-%m-%d %H:%M:%S", math.floor(data.m_time / 1000))
if type == 2 and data.user_nick and #data.user_nick > 0 then
obj:GetChild('tex_msg').text = string.format("【%s(%s)】用户为亲友圈充值%d房卡，剩余%d房卡", data.user_nick, data.uid,
data.diamo_num, data.diamo_cur)
else
obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data.diamo_type + 1],
data.diamo_num, data.diamo_cur)
end
end
function M:Show(groupId)

7
lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
View File

@ -42,6 +42,7 @@ end
local function QuitFamily(self)
local uid = DataManager.SelfUser.account_id
local group = DataManager.groups:get(self.groupId)
local groupName = group.name
local player = group.memberMap[uid]
local tips = "确定退出该亲友圈?"
@ -74,6 +75,12 @@ local function QuitFamily(self)
-- end
-- ViewManager.ChangeView(ViewManager.View_Lobby)
-- else
if group.lev == 1 then
local win = MsgWindow.new(self._view,
string.format("群主【%s】解散了【%s】亲友圈", DataManager.SelfUser.nick_name, groupName),
MsgWindow.MsgMode.OnlyOk)
win:Show()
end
Broadcast.Send(BroadcastEvent.OnOutFamily2)
-- end
self:Close()

19
lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua
View File

@ -40,10 +40,21 @@ function M:Init()
end
function M:msgRenderer(index, obj)
local data = self.msgData
obj:GetChild('tex_time').text = os.date("%Y-%m-%d %H:%M:%S", math.floor(data[index + 1].m_time / 1000))
obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data[index + 1].diamo_type + 1],
data[index + 1].diamo_num, data[index + 1].diamo_cur)
local data = self.msgData[index + 1]
local type = data.diamo_type
obj:GetChild('tex_time').text = os.date("%Y-%m-%d %H:%M:%S", math.floor(data.m_time / 1000))
if type == 2 and data.user_nick and #data.user_nick > 0 then
obj:GetChild('tex_msg').text = string.format("【%s(%s)】用户为%s亲友圈充值%d房卡，剩余%d房卡", data.user_nick, data.uid,
(data.group_name and #data.group_name > 0) and string.format("【%s(%s)】", data.group_name, data.group_id) or
"",
data.diamo_num, data.diamo_cur)
elseif type == 1 and data.group_name and #data.group_name > 0 then
obj:GetChild('tex_msg').text = string.format("您解散了【%s(%s)】亲友圈,返还您%d房卡，剩余%d房卡", data.group_name, data.group_id,
data.diamo_num, data.diamo_cur)
else
obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data.diamo_type + 1],
data.diamo_num, data.diamo_cur)
end
end
function M:Show(groupId)

BIN
wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/libclinkapi-lib.so
View File

Binary file not shown.

33
wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/libclinkapi-lib.so.meta
View File

@ -1,33 +0,0 @@
fileFormatVersion: 2
guid: 573af538d71a8364890b8cbaa0a776d8
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings:
CPU: ARM64
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

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

@ -1,80 +1,80 @@
[
{
"lua_path": "/tolua_project,/base_project,/main_project",
"ver": "1.0.6",
"ver": "1.0.7",
"name": "base_script",
"check": true,
"bundle": "base/base_script",
"version": "1.0.29"
"version": "1.0.7"
},
{
"ver": "1.0.6",
"name": "common",
"check": true,
"bundle": "base/common",
"version": "1.0.22"
"version": "1.0.6"
},
{
"ver": "1.0.6",
"name": "login",
"check": true,
"bundle": "base/login",
"version": "1.0.23"
"version": "1.0.6"
},
{
"ver": "1.0.6",
"name": "lobby",
"check": true,
"bundle": "base/lobby",
"version": "1.0.24"
"version": "1.0.6"
},
{
"ver": "1.0.6",
"name": "Family",
"check": true,
"bundle": "base/Family",
"version": "1.0.23"
"version": "1.0.6"
},
{
"ver": "1.0.6",
"name": "chat",
"check": true,
"bundle": "base/chat",
"version": "1.0.8"
"version": "1.0.6"
},
{
"ver": "1.0.6",
"name": "newgroup",
"check": true,
"bundle": "base/newgroup",
"version": "1.0.21"
"version": "1.0.6"
},
{
"ver": "1.0.6",
"name": "rank",
"check": true,
"version": "1.0.8",
"version": "1.0.6",
"bundle": "base/rank"
},
{
"ver": "1.0.6",
"name": "main_majiang",
"check": true,
"version": "1.0.25",
"version": "1.0.6",
"bundle": "base/main_majiang"
},
{
"ver": "1.0.6",
"name": "main_poker",
"check": true,
"version": "1.0.23",
"version": "1.0.6",
"bundle": "base/main_poker"
},
{
"ver": "1.0.6",
"name": "main_zipai",
"check": true,
"version": "1.0.8",
"version": "1.0.6",
"bundle": "base/main_zipai"
},
{
@ -82,7 +82,7 @@
"name": "static",
"check": true,
"bundle": "base/static",
"version": "1.0.8"
"version": "1.0.6"
},
{
"ver": "1.0.6",
@ -90,20 +90,20 @@
"name": "embed",
"check": true,
"bundle": "base/embed",
"version": "1.0.21"
"version": "1.0.6"
},
{
"ver": "1.0.6",
"name": "main_pokemajiang",
"check": true,
"version": "1.0.8",
"version": "1.0.6",
"bundle": "base/main_pokemajiang"
},
{
"ver": "1.0.6",
"name": "main_zipaimajiang",
"check": true,
"version": "1.0.8",
"version": "1.0.6",
"bundle": "base/main_zipaimajiang"
}
]

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

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes → wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
View File

Binary file not shown.

109
wb_unity_pro/Pack/asset_config1.0.7.json Normal file
View File

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

1
wb_unity_pro/ProjectSettings/GraphicsSettings.asset
View File

@ -39,6 +39,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

4
wb_unity_pro/ProjectSettings/ProjectSettings.asset
View File

@ -12,8 +12,8 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: qyhy
productName: "\u68CB\u6E90\u4E92\u5A31"
companyName: quyou
productName: "\u8DA3\u53CB"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}