编辑玩法换图和修复bug

lua_probject/base_project/Game/Controller/GameController.lua

@@ -140,12 +140,15 @@ function M:WitnessGame(group_id, player_id, room_id)
     _client:send(Protocol.GAME_WITNESS_ROOM, _data)
 end
 
-function M:ExitWitnessGame()
+function M:ExitWitnessGame(pid, gid, rid)
     local _client = ControllerManager.GameNetClinet
     if not _client then
         return
     end
     local _data = {}
+    _data["pid"] = pid
+    _data["gid"] = gid
+    _data["room_id"] = rid
     _client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data)
 end
 

lua_probject/base_project/Game/View/Family/PlayEditView.lua

@@ -22,7 +22,11 @@ function PlayEditView:Refalsh(groupId)
     self.groupId = groupId
     self.group = DataManager.groups:get(self.groupId)
     local playList = self.group.playList
-    self.list_gamePlay.numItems = #playList + 1
+    if self.list_gamePlay.numItems == #playList + 1 then
+        self.list_gamePlay:RefreshVirtualList()
+    else
+        self.list_gamePlay.numItems = #playList + 1
+    end
 end
 
 function PlayEditView:Init()

lua_probject/base_project/Game/View/LobbyView.lua

@@ -94,6 +94,10 @@ function M:InitView(url)
 
     local btn_family = self._view:GetChild("btn_family")
     btn_family.onClick:Add(function()
+        local user = DataManager.SelfUser
+        if user.group_id ~= 0 then
+            self:ReconnectRoom(user.group_id)
+        end
         ControllerManager.ChangeController(NewGroupController)
         ViewManager.ChangeView(ViewManager.View_Family)
     end)

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -87,7 +87,7 @@ function M:FillGameData()
     pt(games)
     -- n65.visible = false
     if self.room_config then
-        page = self.room_config.gameType
+        page = self.room_config.gameType or 1
         for k, v in ipairs(games) do
             if self.room_config.gameType == v.gameType then
                 if self.room_config.gameId == v.game_id then
@@ -98,6 +98,7 @@ function M:FillGameData()
             end
         end
     end
+    printlog("lingmeng GameListView.new", lst_game, index, page, self.room_config)
     self.gl_view = GameListView.new(lst_game, index, page, self.room_config)
     local btn_close = lst_game:GetChild("btn_close")
     btn_close.onClick:Set(function()

lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua

@@ -160,31 +160,17 @@ function M:LoadConfigData(data)
     --pt(data)
     local _config = self._config
     _config:GetController("round").selectedIndex = data.opt - 1
-    _config:GetController("play_list").selectedIndex = data.maxPlayers - 2
+    _config:GetController("peopleNum").selectedIndex = data.maxPlayers - 2
 
+    _config:GetController("ZiMo").selectedIndex = data.zimo
+    _config:GetController("ShaoZhuang").selectedIndex = data.shaozhuang
+    _config:GetController("FengDing").selectedIndex = data.fengding
+    _config:GetController("TianDiHu").selectedIndex = data.Tiandihu
+    _config:GetController("ZiKeChengShun").selectedIndex = data.zikechengshun
+    _config:GetController('ZhuangFenFanBei').selectedIndex = data.zhuangfenfanbei
 
-    _config:GetController("fengding").selectedIndex = data.fengding
-
-    _config:GetController("wanfa").selectedIndex = data.wanfa
-    _config:GetChild("btn_qidui").selected = data.qiduijiafan
-    _config:GetChild("btn_shoudailong").selected = data.shoudailongjiafan
-    _config:GetChild("btn_loudilong").selected = data.loudilongjiafan
-    _config:GetChild("btn_bunengchi").selected = data.bunengchi
-
-    _config:GetChild("btn_doudizhu").selected = data.doudizhu
-    _config:GetChild("btn_doudizhufanbei").selected = data.doudizhufanbei
-
-    if _config:GetChild("xipai") then
-        _config:GetChild("xipai").selected = data.xi_pai
-    end
-
-    if oldGameVersion == 2 then
-        self.xipaiValueText.text = data.xi_pai_score / 1000
-        self.xipaiValue = data.xi_pai_score / 1000
-
-        self.anchouValueText.text = data.an_chou_score / 1000
-        self.anchouValue = data.an_chou_score / 1000
-    end
+    _config:GetChild("n92").value = data.jiangma
+    self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
 end
 
 function M:LoadConfigToDetail(data)

lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua

@@ -157,31 +157,16 @@ function M:LoadConfigData(data)
     --pt(data)
     local _config = self._config
     _config:GetController("round").selectedIndex = data.opt - 1
-    _config:GetController("play_list").selectedIndex = data.maxPlayers - 2
+    _config:GetController("peopleNum").selectedIndex = data.maxPlayers - 2
 
+    _config:GetController("ZiMo").selectedIndex = data.zimo
+    _config:GetController("GangJiangMa").selectedIndex = data.gangjiangma
+    _config:GetController("FengDing").selectedIndex = data.fengding
+    _config:GetController("SanJingChengMa").selectedIndex = data.sanjingjiangma
+    _config:GetController("ZiKeChengShun").selectedIndex = data.zikechengshun
 
-    _config:GetController("fengding").selectedIndex = data.fengding
-
-    _config:GetController("wanfa").selectedIndex = data.wanfa
-    _config:GetChild("btn_qidui").selected = data.qiduijiafan
-    _config:GetChild("btn_shoudailong").selected = data.shoudailongjiafan
-    _config:GetChild("btn_loudilong").selected = data.loudilongjiafan
-    _config:GetChild("btn_bunengchi").selected = data.bunengchi
-
-    _config:GetChild("btn_doudizhu").selected = data.doudizhu
-    _config:GetChild("btn_doudizhufanbei").selected = data.doudizhufanbei
-
-    if _config:GetChild("xipai") then
-        _config:GetChild("xipai").selected = data.xi_pai
-    end
-
-    if oldGameVersion == 2 then
-        self.xipaiValueText.text = data.xi_pai_score / 1000
-        self.xipaiValue = data.xi_pai_score / 1000
-
-        self.anchouValueText.text = data.an_chou_score / 1000
-        self.anchouValue = data.an_chou_score / 1000
-    end
+    _config:GetChild("n92").value = data.jiangma
+    self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
 end
 
 function M:LoadConfigToDetail(data)

lua_probject/extend_project/extend/majiang/lichuan/EXSettingView.lua

@@ -50,7 +50,10 @@ function M:init(url)
     local _btn_logout = self._view:GetChild('btn_closeRoom')
     _btn_logout.onClick:Set(function()
         if self._flag_witness then
-            self._mainView._gamectr:ExitWitnessGame()
+            local _room = DataManager.CurrenRoom
+            pt(_room)
+            self._mainView._gamectr:ExitWitnessGame(_room.play_id, _room.game_id,
+                _room.room_id)
             ViewManager.ChangeView(ViewManager.View_Family)
         else
             if self._mainView.dismiss_room_cd_time > 0 then

lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua

@@ -158,24 +158,17 @@ function M:LoadConfigData(data)
     --pt(data)
     local _config = self._config
     _config:GetController("round").selectedIndex = data.opt - 1
-    _config:GetController("play_list").selectedIndex = data.maxPlayers - 2
+    _config:GetController("peopleNum").selectedIndex = data.maxPlayers - 2
 
+    _config:GetController("ZiMo").selectedIndex = data.zimo
+    _config:GetController("ShaoZhuang").selectedIndex = data.shaozhuang
+    _config:GetController("FengDing").selectedIndex = data.fengding
+    _config:GetController("ZuoMa").selectedIndex = data.zuoma
+    _config:GetController("ZhuanWan").selectedIndex = data.zhuanwan
+    _config:GetController("JiaHu").selectedIndex = data.jiahu
 
-    _config:GetController("fengding").selectedIndex = data.fengding
-
-    _config:GetController("wanfa").selectedIndex = data.wanfa
-    _config:GetChild("btn_qidui").selected = data.qiduijiafan
-    _config:GetChild("btn_shoudailong").selected = data.shoudailongjiafan
-    _config:GetChild("btn_loudilong").selected = data.loudilongjiafan
-    _config:GetChild("btn_bunengchi").selected = data.bunengchi
-
-    _config:GetChild("btn_doudizhu").selected = data.doudizhu
-    _config:GetChild("btn_doudizhufanbei").selected = data.doudizhufanbei
-
-    if _config:GetChild("xipai") then
-        _config:GetChild("xipai").selected = data.xi_pai
-    end
-
+    _config:GetChild("n92").value = data.jiangma
+    self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
     -- if oldGameVersion == 2 then
     -- 	self.xipaiValueText.text = data.xi_pai_score / 1000
     -- 	self.xipaiValue = data.xi_pai_score / 1000

lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua

@@ -68,87 +68,75 @@ end
 
 function M:LoadConfigData(data)
     local _config = self._config
-
-    _config:GetController("rule").selectedIndex = data.rule == 2 and 0 or 1
-    _config:GetController("play_list").selectedIndex = data.leaf - 1
-    _config:GetController("willBeOut").selectedIndex = data.willBeOut - 1
-    _config:GetController("heart10").selectedIndex = data.heartten - 1
-    _config:GetController("bombSpring").selectedIndex = data.minboom - 1
-    _config:GetController("player_num").selectedIndex = data.maxPlayers == 2 and 0 or 1
-    _config:GetController("Cost").selectedIndex = data.AA == 0 and 0 or 1
-    _config:GetController("showlength").selectedIndex = data.showlength
-    _config:GetController("fourBeltThree").selectedIndex = data.fourBeltThree
-    _config:GetController("demolition").selectedIndex = data.demolition
-    _config:GetController("fangzuobi").selectedIndex = data.fangzuobi
-
+    pt(data)
     _config:GetController("round").selectedIndex = data.opt - 1
     _config:GetController("handcard").selectedIndex = 2 - data.leaf
     _config:GetController("peopleNum").selectedIndex = 3 - data.maxPlayers
-    local showCardNum = _config:GetController("showCardNum").selectedIndex
-    local wanfa1_1 = _config:GetController("wanfa1_1").selectedIndex
-    local wanfa1_2 = _config:GetController("wanfa1_2").selectedIndex
-    local wanfa1_3 = _config:GetController("wanfa1_3").selectedIndex
-    local wanfa1_4 = _config:GetController("wanfa1_4").selectedIndex
-    local wanfa1_5 = _config:GetController("wanfa1_5").selectedIndex
-    local wanfa2_1 = _config:GetController("wanfa2_1").selectedIndex
+    _config:GetController("showCardNum").selectedIndex = 1 - data.showlength
+    _config:GetController("wanfa1_1").selectedIndex = data.planeNoBelt
+    _config:GetController("wanfa1_2").selectedIndex = data.planelack
+    _config:GetController("wanfa1_3").selectedIndex = data.fourDaiThree and 1 or 0
+    _config:GetController("wanfa1_4").selectedIndex = data.heartten - 1
+    _config:GetController("wanfa1_5").selectedIndex = 2 - data.rule
+    _config:GetController("wanfa2_1").selectedIndex = data.specilAdd
 
-    local sandaidan = data.sandaidan
-    if sandaidan ~= nil and sandaidan == 1 then
-        _config:GetChild("sandaidan").selected = true
+    -- local sandaidan = data.sandaidan
+    -- if sandaidan ~= nil and sandaidan == 1 then
+    --     _config:GetChild("sandaidan").selected = true
 
-        _config:GetChild("planelack").selected = false
-        _config:GetChild("Threelack").selected = false
-    else
-        _config:GetChild("sandaidan").selected = false
+    --     _config:GetChild("planelack").selected = false
+    --     _config:GetChild("Threelack").selected = false
+    -- else
+    --     _config:GetChild("sandaidan").selected = false
 
-        _config:GetChild("planelack").selected = data.planelack == 1 and true or false
-        _config:GetChild("Threelack").selected = data.threelack == 1 and true or false
-    end
+    --     _config:GetChild("planelack").selected = data.planelack == 1 and true or false
+    --     _config:GetChild("Threelack").selected = data.threelack == 1 and true or false
+    -- end
 
-    local fs = data.fs
-    if fs ~= nil and fs == 1 then
-        _config:GetChild("fan_sprint").selected = true
-    else
-        _config:GetChild("fan_sprint").selected = false
-    end
+    -- local fs = data.fs
+    -- if fs ~= nil and fs == 1 then
+    --     _config:GetChild("fan_sprint").selected = true
+    -- else
+    --     _config:GetChild("fan_sprint").selected = false
+    -- end
 
-    local ba = data.ba
-    if ba ~= nil and ba == 1 then
-        _config:GetChild("boom_add").selected = true
-    else
-        _config:GetChild("boom_add").selected = false
-    end
+    -- local ba = data.ba
+    -- if ba ~= nil and ba == 1 then
+    --     _config:GetChild("boom_add").selected = true
+    -- else
+    --     _config:GetChild("boom_add").selected = false
+    -- end
 
-    _config:GetChild("ThreeA").selected = data.threeA == 1 and true or false
+    -- _config:GetChild("ThreeA").selected = data.threeA == 1 and true or false
 
-    if data.piao ~= nil then
-        _config:GetController("piao").selectedIndex = data.piao
-    end
+    -- if data.piao ~= nil then
+    --     _config:GetController("piao").selectedIndex = data.piao
+    -- end
 
-    if data.daniao ~= nil then
-        _config:GetController("daniao").selectedIndex = data.daniao
-    end
+    -- if data.daniao ~= nil then
+    --     _config:GetController("daniao").selectedIndex = data.daniao
+    -- end
 
-    if _config:GetChild("fourBeltThree") then
-        _config:GetChild("fourBeltThree").selected = data.fourDaiTwo
-    end
+    -- if _config:GetChild("fourBeltThree") then
+    --     _config:GetChild("fourBeltThree").selected = data.fourDaiTwo
+    -- end
 
-    if _config:GetChild("fourBeltTwo") then
-        _config:GetChild("fourBeltTwo").selected = data.fourDaiThree
-    end
+    -- if _config:GetChild("fourBeltTwo") then
+    --     _config:GetChild("fourBeltTwo").selected = data.fourDaiThree
+    -- end
 
-    if _config:GetChild("xipai") then
-        _config:GetChild("xipai").selected = data.xi_pai
-    end
+    -- if _config:GetChild("xipai") then
+    --     _config:GetChild("xipai").selected = data.xi_pai
+    -- end
 
 
-    if oldGameVersion == 2 then
-        self.xipaiValueText.text = data.xi_pai_score / 1000
-        self.xipaiValue = data.xi_pai_score / 1000
+    -- if oldGameVersion == 2 then
+    --     self.xipaiValueText.text = data.xi_pai_score / 1000
+    --     self.xipaiValue = data.xi_pai_score / 1000
 
-        self.anchouValueText.text = data.an_chou_score / 1000
-        self.anchouValue = data.an_chou_score / 1000
-    end
+    --     self.anchouValueText.text = data.an_chou_score / 1000
+    --     self.anchouValue = data.an_chou_score / 1000
+    -- end
 end
 
 function M:SelectedConfigData()

wb_new_ui/assets/Lobby/component/CreatePlay/Component/Single_playName.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="456,150" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n6_p8hp" name="icon1" xy="0,0" size="456,150" url="ui://2d9xdj6zp8hp7cz3" fill="scale">
+    <loader id="n6_p8hp" name="icon1" xy="0,0" size="456,150" url="ui://2d9xdj6zp8hp7cz3" fill="scaleFree">
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <loader id="n7_p8hp" name="icon2" xy="0,0" size="456,150" url="ui://2d9xdj6zp8hp7cz2" fill="scale">
+    <loader id="n7_p8hp" name="icon2" xy="0,0" size="456,150" url="ui://2d9xdj6zp8hp7cz2" fill="scaleFree">
       <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>

wb_new_ui/assets/Lobby/package.xml

@@ -570,6 +570,12 @@
     <component id="p8hp7cz8" name="Single_gameName3.xml" path="/component/CreatePlay/Component/" exported="true"/>
     <image id="p8hp7cz9" name="CreateRoom12a.png" path="/component/CreatePlay/Image/"/>
     <image id="p8hp7cza" name="CreateRoom12b.png" path="/component/CreatePlay/Image/"/>
+    <image id="p8hp7czb" name="fuzhoumajiang1.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7czc" name="fuzhoumajiang2.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7czd" name="jinximajiang1.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7cze" name="jinximajiang2.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7czf" name="nanchengmajiang1.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7czg" name="nanchengmajiang2.png" path="/component/CreatePlay/Image/" exported="true"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: dadc097a17cc2c1419d22885331a6b76
+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: 

wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_p8hp7cyv.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta

@@ -18,5 +18,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/ecdcba4d24b8eea330dcc6aff5cb989a
   assetBundleVariant: 

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ 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}