新增文件

lua_probject/base_project/Game/Controller/Broadcast.lua

@@ -0,0 +1,44 @@
+Broadcast = {}
+local _events = {}
+
+function Broadcast.AddListener(eventName, Func, Obj)
+    if _events[eventName] == nil then
+        _events[eventName] = {}
+    end
+    local event = _events[eventName]
+    event[#event + 1] = {
+        func = Func,
+        obj = Obj
+    }
+end
+
+function Broadcast.RemoveListener(eventName, func)
+    local event = _events[eventName]
+    if event == nil then
+        return
+    end
+
+    for _, e in pairs(event) do
+        if e.func == func then
+            event[_] = nil
+            return
+        end
+    end
+end
+
+function Broadcast.Send(eventName, ...)
+    local event = _events[eventName]
+    if event == nil then
+        return
+    end
+
+    for _, e in pairs(event) do
+        e.func(e.obj, ...)
+    end
+end
+
+BroadcastEvent = {
+
+    OnJoinsChange = 'OnJoinsChange'
+}
+

lua_probject/base_project/Game/View/EXsettingView.lua

@@ -0,0 +1,98 @@
+--设置窗口对象
+
+local EXSettingView = {}
+
+local M = EXSettingView
+setmetatable(M, { __index = BaseWindow })
+
+function EXSettingView:Show(room)
+    self._room = room
+
+    -- 房主，第一个进房间的人
+    local roomOwner = self._room.player_list[1].self_user.account_id
+
+    if roomOwner == DataManager.SelfUser.account_id then
+        self.cBtn.selectedIndex = 1
+    else
+        self.cBtn.selectedIndex = 0
+    end
+
+    BaseWindow.Show(self)
+end
+
+function EXSettingView.new(main_view, flag_witness)
+    local self = setmetatable({}, { __index = M })
+    self.class = 'EXSettingView'
+    self._close_destroy = true
+    self._mainView = main_view
+    self._flag_witness = flag_witness
+    self:init('ui://Main_Majiang/Setting')
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+
+    local view = self._view
+    local slider_sound = view:GetChild('slider_vedio_sound')
+    local slider_music = view:GetChild('slider_vedio_music')
+    local btn_music = view:GetChild('btn_vedio_music')
+    local btn_sound = view:GetChild('btn_vedio_sound')
+
+    self.cBtn = self._view:GetController('cBtn')
+
+    -- slider_sound.value = GameApplication.Instance.SoundValue
+    -- slider_music.value = GameApplication.Instance.MusicValue
+
+    slider_music.onChanged:Add(function()
+        -- GameApplication.Instance.MusicValue = slider_music.value
+        -- btn_music.selected = false
+        -- GameApplication.Instance.MusicMute = false;
+    end)
+
+    slider_sound.onChanged:Add(function()
+        -- GameApplication.Instance.SoundValue = slider_sound.value
+        -- btn_sound.selected = false
+        -- GameApplication.Instance.SoundMute = false;
+    end)
+
+    btn_sound.onClick:Add(function()
+        -- GameApplication.Instance.SoundMute = btn_sound.selected;
+    end)
+
+    btn_music.onClick:Add(function()
+        -- GameApplication.Instance.MusicMute = btn_music.selected;
+    end)
+
+    local _btn_logout = self._view:GetChild('btn_cancelRoom')
+    _btn_logout.onClick:Set(function()
+        if self._flag_witness then
+            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
+                ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
+            else
+                local _gamectr = ControllerManager.GetController(GameController)
+                _gamectr:AskDismissRoom()
+            end
+        end
+    end)
+
+    self._view:GetChild("btn_closeRoom").onClick:Set(function()
+        local _gamectr = ControllerManager.GetController(GameController)
+        _gamectr:LevelRoom(function(res)
+            print("退出房间")
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode)
+                return
+            end
+            ViewManager.ChangeView(ViewManager.View_Family)
+        end)
+    end)
+end
+
+return M

lua_probject/base_project/Game/View/WitnessView.lua

@@ -0,0 +1,27 @@
+local MJSettingView = require("main.majiang.MJSettingViewNew")
+local TableBG = require("Game.Data.TableBG")
+
+local bg_config = {
+    { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
+    { id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" },
+    { id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" },
+    { id = 3, url = "base/main_majiang/bg/bg4", thumb = "ui://Main_Majiang/b04" }
+}
+
+local WitnessView = {}
+setmetatable(WitnessView, { __index = BaseView })
+function WitnessView:init()
+    self.btn_setting = self._view:GetChild("btn_setting")
+
+    self.btn_setting.onClick:Set(function()
+            local view = MJSettingView.new(self, true)
+        view:Show()
+    end)
+end
+
+function WitnessView:InitView()
+    local default_bg = 1
+    TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
+end
+
+return WitnessView

wb_new_ui/assets/Main_Majiang/Main_new/Component/com_logo.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="229,41">
+  <controller name="cType" pages="0,,1,,2,,3," selected="0">
+    <remark page="0" value="抚州"/>
+    <remark page="1" value="南城"/>
+    <remark page="2" value="黎川"/>
+    <remark page="3" value="金溪"/>
+  </controller>
+  <displayList>
+    <image id="n5_o4nh" name="n5" src="o4nh1eb" fileName="Main_new/Image/121.png" xy="0,0">
+      <gearDisplay controller="cType" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n6_o4nh" name="n6" src="o4nh1ef" fileName="Main_new/Image/125.png" xy="1,0">
+      <gearDisplay controller="cType" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n7_o4nh" name="n7" src="o4nh1eg" fileName="Main_new/Image/126.png" xy="0,0">
+      <gearDisplay controller="cType" pages="2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n8_o4nh" name="n8" src="o4nh1eh" fileName="Main_new/Image/127.png" xy="1,0">
+      <gearDisplay controller="cType" pages="3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_vipCancel.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="197,78" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_xo4i" name="n0" src="xo4i1bq" fileName="Main_new/Image/dismiss1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button downEffect="scale" downEffectValue="1.1"/>
+</component>

wb_new_ui/assets/dongxiao/package.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="eveu6b6y">
+  <resources>
+    <movieclip id="j9jp12" name="MovieClip1.jta" path="/"/>
+    <movieclip id="j9jp14" name="MovieClip3.jta" path="/"/>
+    <movieclip id="j9jp17" name="MovieClip6.jta" path="/"/>
+    <movieclip id="j9jp18" name="MovieClip7.jta" path="/"/>
+    <movieclip id="j9jp19" name="MovieClip8.jta" path="/"/>
+  </resources>
+  <publish name=""/>
+</packageDescription>

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: c8910f9a4cb5ac945b01a0503535e27d
+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: 2
+    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: 3
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 3
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 3
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 3
+    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/newgroup/ui/NewGroup_atlas0_2.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 68725cda571bdde4ebe623714930575a
+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: base/newgroup/1876b2140d79b7dc6c2674f954027415
+  assetBundleVariant: