diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua
index 5c5ee0b4..381729b7 100644
--- a/lua_probject/base_project/Game/Controller/GameController.lua
+++ b/lua_probject/base_project/Game/Controller/GameController.lua
@@ -38,7 +38,7 @@ GameEvent = {
--推送道具互动
MISSILE = "MISSILE",
-
+
--Home状态推送
HOMESTATE = "HOMESTATE",
}
@@ -419,6 +419,7 @@ end
-- 聊天事件
function M:OnEventInteraction(evt_data)
+ --[[
if self._room.ban_chat1 == false or self._room.ban_chat2 == false then
self._cacheEvent:Enqueue(
function()
@@ -427,9 +428,16 @@ function M:OnEventInteraction(evt_data)
local type1 = evt_data['type']
local parm = evt_data['parm']
DispatchEvent(self._dispatcher, GameEvent.Interaction, p, type1, parm)
- end
- )
- end
+ end)
+ end]]
+
+ self._cacheEvent:Enqueue(function()
+ local playerid = evt_data['playerid']
+ local p = self._room:GetPlayerById(playerid)
+ local type1 = evt_data['type']
+ local parm = evt_data['parm']
+ DispatchEvent(self._dispatcher, GameEvent.Interaction, p, type1, parm)
+ end)
end
-- GPS更新事件
diff --git a/lua_probject/base_project/Game/View/Common/BaseWindow.lua b/lua_probject/base_project/Game/View/Common/BaseWindow.lua
index a6553c20..c36813e6 100644
--- a/lua_probject/base_project/Game/View/Common/BaseWindow.lua
+++ b/lua_probject/base_project/Game/View/Common/BaseWindow.lua
@@ -162,6 +162,8 @@ function M:Show()
local scaleY = GRoot.inst.height / self._contentPane.height
local scaleX = GRoot.inst.width / self._contentPane.width
self._contentPane:SetScale(scaleX, scaleY)
+ --self._contentPane.x = 0
+ --self._contentPane.y = 0
end
if self._full then
diff --git a/lua_probject/base_project/Game/View/Family/PlayEditView.lua b/lua_probject/base_project/Game/View/Family/PlayEditView.lua
index 0ebf28f5..3f7ee9c0 100644
--- a/lua_probject/base_project/Game/View/Family/PlayEditView.lua
+++ b/lua_probject/base_project/Game/View/Family/PlayEditView.lua
@@ -8,7 +8,7 @@ local function UpdateFamilyRoom(self)
return
end
- view:UpdateFamilyRoom(self.groupId)
+ view:UpdateFamilyRoom(nil, self.groupId)
end
function PlayEditView.New()
diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua
index 6a363756..c8c93dd2 100644
--- a/lua_probject/base_project/Game/View/MainView.lua
+++ b/lua_probject/base_project/Game/View/MainView.lua
@@ -75,6 +75,8 @@ function M:init()
UIPackage.AddPackage('base/chat/ui/Chat')
self.Fix_Msg_Chat = ViewUtil.Fix_Msg_Chat -- 自动回复消息列表
self.Fix_Msg_Chat2 = nil -- 自动回复列表2
+ self._scale = true
+ self._full_offset = false
self.class = "MainView"
self:InitView()
self:SetTuoGuanState()
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
index 55270d95..0dbd8735 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
@@ -13,7 +13,7 @@ function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback)
local self = setmetatable({}, { __index = M })
self.class = "GroupGameSettingView"
self._animation = false
- self._full = true
+ --self._full = true
self._full_offset = false
self.selectedIndex = index
self._close_destroy = true
@@ -34,7 +34,8 @@ function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback)
self.rewards_data = {}
self.callback = callback
- self._full = true
+ --self._full = true
+ self._scale = true
self:init("ui://NewGroup/View_GroupGameSetting")
return self
end
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 922aef5c..38e8c07b 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
@@ -10,7 +10,9 @@
-
+
+
+
@@ -243,7 +245,7 @@
-
+
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 fe24241e..99bdee99 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/newgroup/ui/FGAssist_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png
index 59fc4d50..848ca295 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes
index 8a1f6705..7db64e83 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes differ