diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua
index 88129da5..213ef463 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua
@@ -19,7 +19,7 @@ function FamilyInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback)
self.callback = callback
print("lingmeng FGAssistInviteView1")
UIPackage.AddPackage('base/newgroup/ui/FGAssist')
- self:initView("ui://FGAssist/panel_invite")
+ self:initView("ui://FGAssist/panel_invited")
print("lingmeng FGAssistInviteView2")
return self
@@ -56,7 +56,14 @@ function M:initView(url)
end
function M:FillData()
+ local group = DataManager.groups:get(self.groupid)
+ local play = group:getPlay(self.pid)
+ local player = group.memberMap[self.invite_id]
+ self._viewText_groupName.text = group.name
+ self._viewText_gameName.text = play.game_name
+ self._viewText_inviteName.text = player.nick
+ self._viewText_playName.text = play.name
end
function M:Destroy()
diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
index ab08da1b..24937130 100644
--- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua
+++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua
@@ -220,9 +220,12 @@ function M:ShowInteraction(type, str)
Voice.DownLoad(
str,
function(clip)
+ print("lingmeng ShowInteraction")
if (clip) then
+ print("lingmeng ShowInteraction1")
self:ShowMaskVoice(clip.length)
GameApplication.Instance:PlayVoice(clip)
+ print("lingmeng ShowInteraction2")
end
end
)
diff --git a/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml b/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml
deleted file mode 100644
index 6a221383..00000000
--- a/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/FGAssist/package.xml b/wb_new_ui/assets/FGAssist/package.xml
index 10ef6aef..4d518a33 100644
--- a/wb_new_ui/assets/FGAssist/package.xml
+++ b/wb_new_ui/assets/FGAssist/package.xml
@@ -32,7 +32,6 @@
-
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Component/Btn_MessageTalk.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Component/Btn_MessageTalk.xml
new file mode 100644
index 00000000..6fad232e
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Component/Btn_MessageTalk.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/Group 205(1).png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Group 205(1).png
new file mode 100644
index 00000000..00487171
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Group 205(1).png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/Group 205.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Group 205.png
new file mode 100644
index 00000000..00487171
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Group 205.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
index 22038df9..904fff6a 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@@ -7,7 +7,8 @@
-
+
+
@@ -245,9 +246,16 @@
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index f3209fdb..a8f83762 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1223,6 +1223,9 @@
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d1.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d1.png.meta
index e4ce54db..c6de7b25 100644
--- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d1.png.meta
+++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d1.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName:
+ assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d2.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d2.png.meta
index a3571005..be9c3a03 100644
--- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d2.png.meta
+++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_z30d2.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName:
+ assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta
index aeb95883..c579e2cd 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
index efe378f4..3a673327 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta
index c4f57cac..29f6d69a 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png
index 08b0f2a0..ceb4ba40 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta
index 3f703715..90f0cfab 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png
index eeab1661..6d3b314f 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta
index cc2ecd5b..c3836016 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png
index d0549f7c..52f3ea68 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta
index 03f779d4..7ab04525 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png
index df419f6d..e99dd34a 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta
index 92dc39d8..195048b9 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes
index 714714aa..2b76523c 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta
index fd05ec02..1a875077 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta
@@ -3,5 +3,5 @@ guid: 326fa64ee0dd8b94aa86fa1978e56fa5
TextScriptImporter:
externalObjects: {}
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0
assetBundleVariant:
diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes
index bbc97737..81e16253 100644
Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes
index 9ebb4666..23be3c3c 100644
Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes
index 906be42a..7aa3920e 100644
Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
index 26f22a83..14acace1 100644
Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes
index 394c91dc..6c73165e 100644
Binary files a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
index 2dd1005c..ce10d063 100644
Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes
index 6d23c268..6378704c 100644
Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
index 6b04e492..7c12b482 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes
index 86606175..61a3b1ca 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes
index 19215cba..89edab4f 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
index c3661327..7ee3cf02 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes
index 83bb89d6..9b37ed12 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
index e9cf863e..18eebd7f 100644
Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes
index 25e00ebb..12a32b93 100644
Binary files a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
index eaf755a0..2a107fe5 100644
Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.25.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.25.bytes
new file mode 100644
index 00000000..2597aace
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.25.bytes differ