游戏适配、玩法编辑适配、字段废弃

lua_probject/base_project/Game/Controller/GameController.lua

@@ -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更新事件

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

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()

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()

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

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -10,7 +10,9 @@
   <controller name="witness" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73"/>
+    <component id="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
     <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
@@ -243,7 +245,7 @@
     </component>
     <component id="n185_kzuz" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
     <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123">
       <relation target="" sidePair="right-right"/>