hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

梭哈上传

master
罗家炜 2025-04-29 12:11:00 +08:00
parent 6fefee5067
commit 9e8f489f76
38 changed files with 1122 additions and 1377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView_jiangxi.lua
View File

@ -27,6 +27,12 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
self._view:GetController('over').selectedIndex = over
self._view:GetChild('btn_nextRound').onClick:Set(function()
self:Destroy()
local _gamectr = ControllerManager.GetController(GameController)
_gamectr:ConformToNextGame()
end)
self._view:GetController('btn_closeRound').onClick:Set(function()
end)
end

126
lua_probject/extend_project/extend/poker/runfast/RunFast_RoomConfig.lua
View File

@ -7,11 +7,11 @@ local M = {}
--- Create a new RoomConfig
function M.new(config)
setmetatable(M,{__index = RoomConfig})
local self = setmetatable({}, {__index = M})
RoomConfig.init(self,config)
setmetatable(M, { __index = RoomConfig })
local self = setmetatable({}, { __index = M })
RoomConfig.init(self, config)
self.class = "RunFast_RoomConfig"
self.config=config
self.config = config
self.Leaf = config.leaf
self.Rule = config.rule
self.Times = config.times
@ -21,16 +21,16 @@ function M.new(config)
self.AA = config.aa
self.PlayerNum = config.maxPlayers
self.showlength = config.showlength
self.fourBeltThree=config.fourBeltThree
self.demolition=config.demolition
self.fangzuobi=config.fangzuobi
self.planelack=config.planelack
self.threelack=config.threelack
self.threeA=config.threeA
self.tuoguan_active_time=config.tuoguan_active_time
self.tuoguan=config.tuoguan
self.tuoguan_result_type=config.tuoguan_result_type
self.isNonnegative=config.isNonnegative
self.fourBeltThree = config.fourBeltThree
self.demolition = config.demolition
self.fangzuobi = config.fangzuobi
self.planelack = config.planelack
self.threelack = config.threelack
self.threeA = config.threeA
self.tuoguan_active_time = config.tuoguan_active_time
self.tuoguan = config.tuoguan
self.tuoguan_result_type = config.tuoguan_result_type
self.isNonnegative = config.isNonnegative
self.sandaidan = config.sandaidan
self.isHidden = config.isHidden
self.ba = config.ba
@ -47,21 +47,21 @@ function M.new(config)
else
self.daniao = 0
end
if self.isNonnegative == nil then
self.isNonnegative = 0
end
self.energyTab=config.energyTab
if self.energyTab==nil then
self.energyTab=0
self.energyTab = config.energyTab
if self.energyTab == nil then
self.energyTab = 0
end
return self
end
--[[function M:GetDes(sp)
sp = sp or " "
sp = sp or " "
local str = ""
-- str = str.. self.Times.."局"..sp
str = str .. RoomConfig.GetDes(self, sp).." "
@ -93,7 +93,7 @@ end
str = str .. sp1..sp
end
end
if self.Rule == 1 then
str = str.. "第一局黑桃3先出，随后赢家先出".."\n"
else
@ -215,7 +215,7 @@ end
str = str .. sp1..sp
end
end
if self.sandaidan == 1 then
str = str.. "\n三张飞机带单或者对子\n"
end
@ -293,9 +293,9 @@ end
str = str .. sp1..sp
end
end
if self.piao == 0 then
elseif self.piao == 1 then
str = str.. "飘123"
count=count+1
@ -322,7 +322,7 @@ end
end
str = str .. sp1..sp
end
elseif self.piao == 3 then
elseif self.piao == 3 then
str = str.. "飘258"
count=count+1
if count%2==0 then
@ -388,97 +388,95 @@ function M:GetDes(sp)
-- str = str.. self.Times.."局"..sp
str = str .. RoomConfig.GetDes(self, sp)
if self.Leaf == 1 then
str = str.. "15张玩法"..sp
str = str .. "15张玩法" .. sp
else
str = str.. "16张玩法"..sp
str = str .. "16张玩法" .. sp
end
if self.Rule == 1 then
str = str.. "第一局黑桃3先出，随后赢家先出"..sp
str = str .. "第一局黑桃3先出，随后赢家先出" .. sp
else
str = str.. "第一局系统随机选一张先出，随后赢家先出"..sp
str = str .. "第一局系统随机选一张先出，随后赢家先出" .. sp
end
if self.WillBeOut == 1 then
str = str.. "能出必出"..sp
str = str .. "能出必出" .. sp
else
str = str.. "可不必出"..sp
str = str .. "可不必出" .. sp
end
if self.showlength == 1 then
str = str.. "显示剩余牌"..sp
str = str .. "显示剩余牌" .. sp
end
if self.fourBeltThree == 3 then
str = str.. "四带三"..sp
str = str .. "四带三" .. sp
elseif self.fourBeltThree == 2 then
str = str.. "四带二"..sp
str = str .. "四带二" .. sp
end
if self.Heart10 == 1 then
str = str.. "红桃10分数翻倍"..sp
str = str .. "红桃10分数翻倍" .. sp
end
if self.BombSpring == 1 then
str = str.. "4个3 或者3个A 1个2 春天"..sp
str = str .. "4个3 或者3个A 1个2 春天" .. sp
end
if self.demolition == 1 then
str = str.. "炸弹不能拆"..sp
str = str .. "炸弹不能拆" .. sp
end
if self.fangzuobi == 1 and self.PlayerNum==3 then
str = str.. "防作弊"..sp
if self.fangzuobi == 1 and self.PlayerNum == 3 then
str = str .. "防作弊" .. sp
end
if self.sandaidan == 1 then
str = str.. "三张飞机带单或者对子"..sp
str = str .. "三张飞机带单或者对子" .. sp
end
if self.ba == 1 then
str = str.. "炸弹分数算赢家"..sp
str = str .. "炸弹分数算赢家" .. sp
end
if self.fs == 1 then
str = str.. "反春天"..sp
str = str .. "反春天" .. sp
end
if self.planelack == 1 then
str = str.. "飞机少带可接完"..sp
str = str .. "飞机少带可接完" .. sp
end
if self.threelack == 1 then
str = str.. "三张少带可接完"..sp
str = str .. "三张少带可接完" .. sp
end
if self.threeA ==1 then
str = str.. "三张A算炸弹"..sp
if self.threeA == 1 then
str = str .. "三张A算炸弹" .. sp
end
if self.piao == 0 then
elseif self.piao == 1 then
str = str.. "飘123"..sp
str = str .. "飘123" .. sp
elseif self.piao == 2 then
str = str.. "飘235"..sp
elseif self.piao == 3 then
str = str.. "飘258"..sp
str = str .. "飘235" .. sp
elseif self.piao == 3 then
str = str .. "飘258" .. sp
end
if self.daniao == 1 then
str = str.. "打鸟+10"..sp
str = str .. "打鸟+10" .. sp
elseif self.daniao == 2 then
str = str.. "打鸟+20"..sp
str = str .. "打鸟+20" .. sp
elseif self.daniao == 3 then
str = str.. "打鸟+50"..sp
str = str .. "打鸟+50" .. sp
end
return str
end
function M:GetGameJS()
local gamerulepanel= UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/gamerule")
return gamerulepanel
local gamerulepanel = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/gamerule")
return gamerulepanel
end
function M:GetGameSMSize()
return 467,500
return 467, 500
end
function M:GetGameName()
@ -489,4 +487,4 @@ end
-- return self.ShowNumber == 1
--end
return M
return M

18
lua_probject/extend_project/extend/poker/suoha/EXGameInfo.lua
View File

@ -10,7 +10,7 @@ function EXGameInfo.new(blur_view)
setmetatable(M, { __index = IGameInfo })
local self = setmetatable({}, { __index = M })
self.class = "EXGameInfo"
UIPackage.AddPackage("extend/poker/suoha/ui/Info_Poker_SuoHa")
UIPackage.AddPackage("extend/poker/suoha/ui/Info_Poker_SuoHaNew")
return self
end
@ -18,11 +18,11 @@ function M:FillData(view, index)
self._maxPlayer = 2 -- 默认玩家人数
self._roundChoice = 5 -- 回合选项数
-- if oldGameVersion == 1 then
self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_SuoHa/Label_Detail_Play")
-- else
-- self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_SuoHa/Creat_SuoHa_yueyang")
-- end
if oldGameVersion == 1 then
self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_SuoHaNew/Creat_SuoHa")
else
self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_SuoHaNew/Creat_SuoHa_yueyang")
end
if oldGameVersion == 2 then
@ -108,17 +108,17 @@ function M:FillData(view, index)
end)
end
local _help_url = "ui://Info_Poker_SuoHa/Com_help"
local _help_url = "ui://Info_Poker_SuoHaNew/Com_help"
function M:GetHelpUrl()
return _help_url
end
local _icon_url = "ui://Info_Poker_SuoHa/icon"
local _icon_url = "ui://Info_Poker_SuoHaNew/icon"
function M:GetIconUrl()
return _icon_url
end
local _icon_url1 = "ui://Info_Poker_SuoHa/icon1"
local _icon_url1 = "ui://Info_Poker_SuoHaNew/icon1"
function M:GetIconUrl1()
return _icon_url1
end

293
lua_probject/extend_project/extend/poker/suoha/EXGameInfo_jiangxi.lua
View File

@ -1,293 +0,0 @@
---
--- Created by 谌建军.
--- DateTime: 2017/12/18 15:19
---
local EXGameInfo = {}
local M = EXGameInfo
local roundTable = { 10, 15, 20 }
function EXGameInfo.new(blur_view)
setmetatable(M, { __index = IGameInfo })
local self = setmetatable({}, { __index = M })
self.class = "EXGameInfo"
UIPackage.AddPackage("extend/poker/suoha/ui/Info_Poker_SuoHa")
return self
end
function M:FillData(view, index)
self._maxPlayer = 2 -- 默认玩家人数
self._roundChoice = 5 -- 回合选项数
-- if oldGameVersion == 1 then
self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_SuoHa/Label_Detail_Play")
-- else
-- self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_SuoHa/Creat_SuoHa_yueyang")
-- end
-- self._config:GetChild("people_2").onClick:Set(function()
-- self._config:GetController("rule").selectedIndex = 0
-- end)
-- local piao = self._config:GetController("piao")
-- local daniao = self._config:GetController("daniao")
-- piao.onChanged:Add(function()
-- if piao.selectedIndex ~= 0 then
-- daniao.selectedIndex = 0
-- end
-- end)
-- daniao.onChanged:Add(function()
-- if daniao.selectedIndex ~= 0 then
-- piao.selectedIndex = 0
-- end
-- end)
end
local _help_url = "ui://Info_Poker_SuoHa/Com_help"
function M:GetHelpUrl()
return _help_url
end
local _icon_url = "ui://Info_Poker_SuoHa/icon"
function M:GetIconUrl()
return _icon_url
end
local _icon_url1 = "ui://Info_Poker_SuoHa/icon1"
function M:GetIconUrl1()
return _icon_url1
end
local _play_list = { "15张玩法", "16张玩法" }
function M:GetPlayList()
return _play_list
end
function M:LoadConfigData(data)
local _config = self._config
_config:GetController("round").selectedIndex = data.opt - 1
_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
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 = 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 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
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 _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("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
end
function M:SelectedConfigData()
local _config = self._config
local round = _config:GetController("round").selectedIndex
local handcard = _config:GetController("handcard").selectedIndex
local peopleNum = _config:GetController("peopleNum").selectedIndex
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
-- local rule = _config:GetController("rule").selectedIndex
-- local leaf = _config:GetController("play_list").selectedIndex
-- local willBeOut = _config:GetController("willBeOut").selectedIndex
-- local bombSpring = _config:GetController("bombSpring").selectedIndex
-- local heart10 = _config:GetController("heart10").selectedIndex
-- local player_num = _config:GetController("player_num").selectedIndex
-- local AA = _config:GetController("Cost").selectedIndex
-- local showlength = _config:GetController("showlength").selectedIndex
-- local fourBeltThree = _config:GetController("fourBeltThree").selectedIndex
-- local demolition = _config:GetController("demolition").selectedIndex
-- local fangzuobi = _config:GetController("fangzuobi").selectedIndex
-- local planelack = _config:GetChild("planelack").selected and 1 or 0
-- local threelack = _config:GetChild("Threelack").selected and 1 or 0
-- local ThreeA = _config:GetChild("ThreeA").selected and 1 or 0
-- local piao = _config:GetController("piao").selectedIndex
-- local daniao = _config:GetController("daniao").selectedIndex
-- local sandaidan = _config:GetController("sandaidan").selectedIndex
-- local ba = _config:GetChild("boom_add").selected and 1 or 0
-- local fs = _config:GetChild("fan_sprint").selected and 1 or 0
-----
local fourDaiTwo = false
if _config:GetChild("fourBeltThree") then
fourDaiTwo = _config:GetChild("fourBeltThree").selected
end
local fourDaiThree = false
if _config:GetChild("fourBeltTwo") then
fourDaiThree = _config:GetChild("fourBeltTwo").selected
end
local xi_pai = false
if _config:GetChild("xipai") then
xi_pai = _config:GetChild("xipai").selected
end
----
local _data = {}
_data["account_id"] = DataManager.SelfUser.Id
-- _data["AA"] = AA
-- _data["willBeOut"] = willBeOut + 1
-- _data["minboom"] = (willBeOut == 0 and leaf == 1 and player_num == 1) and bombSpring + 1 or 2
-- _data["fourBeltThree"] = fourBeltThree
-- _data["demolition"] = demolition
-- _data["fangzuobi"] = fangzuobi
-- _data["threeA"] = ThreeA
-- _data["piao"] = piao
-- _data["daniao"] = daniao
-- _data["sandaidan"] = sandaidan
-- _data["ba"] = ba
-- _data["fs"] = fs
_data["fourDaiTwo"] = fourDaiTwo
-----------------------lingmeng----------------------------
_data["AA"] = 0
_data["willBeOut"] = 1
_data["minboom"] = 2
_data["fourBeltThree"] = 0
_data["demolition"] = 0
_data["fangzuobi"] = 0
_data["threeA"] = 0
_data["piao"] = 0
_data["daniao"] = 0
_data["sandaidan"] = 0
_data["ba"] = 0
_data["fs"] = 0
_data["leaf"] = handcard == 0 and 2 or handcard --手牌 1是15张，2是16张
_data["opt"] = round + 1 --局数 1是10局 2是15局 3是20局 ("未知")
_data["maxPlayers"] = peopleNum == 1 and 2 or 3 --人数 2是2人 3是三人
_data["rule"] = wanfa1_5 == 0 and 2 or 1 --黑桃3必出 2是选择了该玩法 1是没有该玩法
_data["showlength"] = (showCardNum + 1) % 2 --显示手牌数量 0是不显示 1是显示
_data["planeNoBelt"] = wanfa1_1 --飞机不带
_data["threeNoBelt"] = wanfa1_1 --三张不带
_data["planelack"] = wanfa1_2 --飞机可少带接完
_data["threelack"] = wanfa1_2 --三张可少带接完
_data["fourDaiThree"] = false --四带三 false没有该玩法 true有该玩法
if wanfa1_3 == 1 then
_data["fourDaiThree"] = true
end
_data["heartten"] = wanfa1_4 + 1 --红桃扎鸟 1没有该玩法 2有该玩法 似乎说的是红桃10分数翻倍，具体要问江西那边
_data["specilAdd"] = wanfa2_1 --特殊加分规则：只出一张加扣10分，出2-3张加扣5分 0没有该玩法 1有该玩法
-----------------------------------------------------------
-- if willBeOut == 1 then
-- -- body
-- _data["planelack"] = 0
-- _data["threelack"] = 0
-- else
-- if sandaidan == 1 then
-- _data["planelack"] = 0
-- _data["threelack"] = 0
-- else
-- _data["planelack"] = planelack
-- _data["threelack"] = threelack
-- end
-- end
_data['xi_pai'] = xi_pai
local xi_pai_score = 1
local an_chou_score = 1
-- if oldGameVersion == 2 then
-- xi_pai_score = self.xipaiValue
-- an_chou_score = self.anchouValue
-- end
_data['xi_pai_score'] = xi_pai_score * 1000
_data['an_chou_score'] = an_chou_score * 1000
return _data
end
function M:OnChangeOption(ctype, pay_obj)
IGameInfo.OnChangeOption(self, ctype, pay_obj)
local peopleNum = self._config:GetController("peopleNum")
peopleNum.onChanged:Set(function()
self._maxPlayer = peopleNum.selectedIndex == 1 and 2 or 3
self:ShowVariablePrice(ctype, pay_obj)
end)
end
function M:LoadConfigToDetail(data)
local configData = json.decode(data)
local returnString = string.format("人数%s人", configData.maxPlayers)
return returnString
end
return M

31
lua_probject/extend_project/extend/poker/suoha/EXPlayerInfoView.lua
View File

@ -1,30 +1,36 @@
local PlayerInfoView = require("Game.View.PlayerInfoView_copy")
local PlayerInfoView = require("Game.View.PlayerInfoView")
local M = {}
function M.new(view, mainView)
setmetatable(M, { __index = PlayerInfoView })
local self = setmetatable({}, { __index = M })
setmetatable(M, {__index = PlayerInfoView})
local self = setmetatable({}, {__index = M})
self._view = view
self._main_view = mainView
self:init()
return self
end
function M:FillData(player)
PlayerInfoView.FillData(self, player)
-- if player.cur_hp ~= nil then
-- self:UpdateScore(d2ad(player.cur_hp))
-- else
-- local rt = 1
-- if self._main_view._room.hpOnOff == 1 then
-- rt = self._main_view._room.score_times
-- end
-- self:UpdateScore(player.total_score * rt)
-- end
if player.cur_hp ~= nil then
self:UpdateScore(d2ad(player.cur_hp))
else
local rt = 1
if self._main_view._room.hpOnOff == 1 then
rt = self._main_view._room.score_times
end
self:UpdateScore(player.total_score * rt)
end
end
function M:UpdatePiao(piao)
if piao == nil or piao == -1 then
self._view:GetChild("piao").text = ""
elseif piao == 0 then
@ -42,4 +48,5 @@ function M:UpdatePiao(piao)
end
end
return M

14
lua_probject/extend_project/extend/poker/suoha/ExtendConfig.lua
View File

@ -4,7 +4,7 @@
---
local EXTEND_MODEL_NAME = ...
local EXGameInfo = import(".EXGameInfo_jiangxi")
local EXGameInfo = import(".EXGameInfo")
local SuoHa_MainView = import(".SuoHa_MainView")
local SuoHa_GameController = import(".SuoHa_GameController")
local SuoHa_RoomConfig = import(".SuoHa_RoomConfig")
@ -30,12 +30,12 @@ end
--卸载资源
function M:UnAllAssets()
UIPackage.RemovePackage("extend/poker/suoha/ui/Info_Poker_SuoHa")
UIPackage.RemovePackage("extend/poker/suoha/ui/Info_Poker_SuoHaNew")
self:UnAssets()
end
function M:UnAssets()
UIPackage.RemovePackage("extend/poker/suoha/ui/Extend_Poker_SuoHa")
UIPackage.RemovePackage("extend/poker/suoha/ui/Extend_Poker_SuoHaNew")
ResourcesManager.UnLoadGroup("RunFase_PK")
end
@ -64,7 +64,7 @@ function M:GetGameRule()
end
function M:GetIconUrl()
return "ui://Extend_Poker_SuoHa/icon"
return "ui://Extend_Poker_SuoHaNew/icon"
--
end
@ -168,7 +168,7 @@ function M:FillRoomData(s2croom)
end
end
else
-- -- print("aaaaaaaaaaaaaaaa1111111111111111111111111")
-- print("aaaaaaaaaaaaaaaa1111111111111111111111111")
--pt(s2croom)
room.game_status = 1
@ -255,8 +255,4 @@ function M:FillPlayBackData(pd_data)
room.cmdList = pd_data["cmdList"]
end
function M:LoadConfigToDetail(data)
return data
end
return M

139
lua_probject/extend_project/extend/poker/suoha/SuoHa_MainView.lua
View File

@ -22,16 +22,16 @@ end
local default_bg = 1
local bg_config = {
{ id = 1, url = 'extend/poker/suoha/bg/bg1', thumb = 'ui://Extend_Poker_SuoHa/table_bg1' },
{ id = 2, url = 'extend/poker/suoha/bg/bg2', thumb = 'ui://Extend_Poker_SuoHa/table_bg2' },
{ id = 3, url = 'extend/poker/suoha/bg/bg3', thumb = 'ui://Extend_Poker_SuoHa/table_bg3' }
{ id = 1, url = 'extend/poker/runfast/bg/bg1', thumb = 'ui://Extend_Poker_RunFastNew/table_bg1' },
{ id = 2, url = 'extend/poker/runfast/bg/bg2', thumb = 'ui://Extend_Poker_RunFastNew/table_bg2' },
{ id = 3, url = 'extend/poker/runfast/bg/bg3', thumb = 'ui://Extend_Poker_RunFastNew/table_bg3' }
}
function M:InitView(url)
local room = self._room
UIPackage.AddPackage("extend/poker/suoha/ui/Extend_Poker_SuoHa")
PKMainView.InitView(self, "ui://Extend_Poker_SuoHa/SuoHa_Main_New_" .. room.room_config.people_num, nil, 1,
default_bg, bg_config, nil)
UIPackage.AddPackage("extend/poker/suoha/ui/Extend_Poker_SuoHaNew")
PKMainView.InitView(self, "ui://Extend_Poker_SuoHaNew/SuoHa_Main_" .. room.room_config.people_num, nil, 1, default_bg,
bg_config, nil, "ui://Extend_Poker_SuoHaNew/SettingWindow1")
local _room = DataManager.CurrenRoom
local user_id = DataManager.SelfUser.account_id
local json_data = Utils.LoadLocalFile(user_id .. _room.game_id .. "pai")
@ -170,7 +170,7 @@ function M:InitView(url)
self:ChangeBgmMusic()
self:EventInit()
self._view:GetChild("bg_mask").onClick:Set(function()
self._view:GetChild("mask").onClick:Set(function()
self:ResetPoker()
end)
local btn_rule = self._view:GetChild("right_panel"):GetChild("btn_log")
@ -199,39 +199,13 @@ function M:InitView(url)
self._view:GetChild("shengyu"):GetChild("shengyu").text = "剩余16张"
end
end
------------------lingmeng--------------------------
self._tex_leftTime = self._view:GetChild('Comp_Clock'):GetChild('time') -- 重写
self._text_currenRound = self._view:GetChild('Text_CurrenRound')
self._text_maxRound = self._view:GetChild('Text_MaxMaxRound')
self:UpdateRound(0)
--按钮功能全部未开放
self._view:GetChild('Btn_Spectator').onClick:Set(function()
ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
end)
self._view:GetChild('Btn_GamePlay').onClick:Set(function()
ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
end)
self._view:GetChild('Btn_Check').onClick:Set(function()
ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
end)
self._view:GetChild('Btn_Message').onClick:Set(function()
ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
end)
self._view:GetChild('Btn_Invite').onClick:Set(function()
ViewUtil.ErrorMsg(self._view, "", "该功能还未开放")
end)
----------------------------------------------------
end
function M:UpdateCard(index)
self._room.pai = index
local card_info = self._player_card_info[1]
-- for i=1,#self._room.player_list do
-- -- print(i)
-- print(i)
-- end
card_info:updatePoker()
for _, player in ipairs(self._room.player_list) do
@ -472,7 +446,7 @@ function M:EventInit()
self.rank_view = nil
end
self:UpdateRound(round)
ViewUtil.PlaySound("SuoHa_PK", "extend/poker/suoha/sound/fapai.mp3")
ViewUtil.PlaySound("SuoHaNew_PK", "extend/poker/suoha/sound/fapai.mp3")
local list = _room.player_list
for i = 1, #list do
local p = list[i]
@ -499,9 +473,9 @@ function M:EventInit()
if p.seat == self._room.self_player.seat then
if self._room.room_config.people_num == 3 and self._room.room_config.fangzuobi == 1 then
-- body
card_info:InitPoker(cardlist, false, 1)
card_info:InitPoker(cardlist, true, 1)
else
card_info:InitPoker(cardlist, false)
card_info:InitPoker(cardlist, true)
end
else
--card_info:UpdateHandPoker(#cardlist,true,false) --todo
@ -577,13 +551,11 @@ function M:EventInit()
local otherList = arg[5]
local length = arg[6]
self.ctr_time.selectedIndex = 0
print("lingmengOnPlaySucc", p, card_number, cardstype, num, otherList)
local index = self:GetPos(p.seat)
if index == 1 then
self.caozuo = 0
end
print("lingmengOnPlaySucc1")
local head_info = self._player_info[index]
if head_info._view:GetChild("shengyu") ~= nil then
-- body
@ -593,18 +565,13 @@ function M:EventInit()
head_info._view:GetChild("shengyu"):GetChild("shengyu").text = "剩" .. card_number .. "张"
end
end
print("lingmengOnPlaySucc2")
local card_info = self._player_card_info[index]
card_info:SetOutCardInfo(p.out_card_list, false, true)
print("lingmengOnPlaySucc3")
for i = 1, #otherList do
local other_seat = otherList[i]
local other_card_info = self._player_card_info[self:GetPos(other_seat)]
other_card_info:SetOutCardBlack()
end
print("lingmengOnPlaySucc4")
if index == 1 then
card_info:DeleteHandCards(p.out_card_list)
@ -612,8 +579,6 @@ function M:EventInit()
card_info:SetRemainCardNumber(card_number == 1)
--card_info:UpdateHandPoker(card_number,false,false) -- todo
end
print("lingmengOnPlaySucc5")
if self._room.is_new_bout == true then
for i = 1, #self._room.player_list do
local player = self._room.player_list[i]
@ -634,7 +599,7 @@ function M:EventInit()
-- card_info_i._mask_liangpai:AddChild(chuan)
-- chuan:GetChild("n0").asMovieClip.playing = true
-- ViewUtil.PlaySound("SuoHa_PK", "extend/poker/paodekuai/sound/sunzi.mp3")
-- ViewUtil.PlaySound("SuoHaNew_PK", "extend/poker/paodekuai/sound/sunzi.mp3")
-- coroutine.start(function()
-- coroutine.wait(1.5)
-- if chuan~=nil then
@ -654,8 +619,6 @@ function M:EventInit()
self:_Effect(cardstype, p)
end
end
print("lingmengOnPlaySucc6")
self:PlaySound(p.self_user.sex, self:GetSoundFileName(cardstype, num, self._room.is_new_bout))
if card_number == 1 then
--self:ChangeBgmMusic(2)
@ -669,7 +632,6 @@ function M:EventInit()
self:PlaySound(p.self_user.sex, "card_1")
end)
end
print("lingmengOnPlaySucc7")
end)
@ -870,25 +832,23 @@ function M:EventInit()
local flow = newremaincards[i] % 10
local num = (newremaincards[i] - (newremaincards[i] % 10)) / 10
local card_n = flow * 100 + num
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHa", "poker6")
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHaNew", "poker6")
--local code = self:ChangeCodeByTo(card_n)
-- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card_n)
-- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
local card_code_obj = nil
if DataManager.CurrenRoom.pai == 0 then
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card_n ..
"_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. card_n .. "_1")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card_n)
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. card_n)
end
else
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card_n ..
"_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. card_n .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
end
@ -914,25 +874,25 @@ function M:EventInit()
self.destory_win = nil
self.destory_win = coroutine.start(function()
-- -- print("11111111111111")
-- print("11111111111111")
-- coroutine.wait(1)
if self._room.self_player.seat == win_seat then
local sprint_seat_list = self:GetSpringSeats(info)
if #sprint_seat_list > 0 then
local url = "ui://Extend_Poker_SuoHa/Spring"
local url = "ui://Extend_Poker_SuoHaNew/Spring"
self.WinItem_view = UIPackage.CreateObjectFromURL(url)
self._view:AddChild(self.WinItem_view)
self.WinItem_view:Center()
self.WinItem_view:GetTransition("t0"):Play()
ViewUtil.PlaySound("SuoHa_PK", "base/common/sound/win new.mp3")
ViewUtil.PlaySound("SuoHaNew_PK", "base/common/sound/win new.mp3")
end
-- local url = #sprint_seat_list > 0 and "ui://Extend_Poker_SuoHa/Spring" or "ui://Extend_Poker_SuoHa/Win_Mine"
-- local url = #sprint_seat_list > 0 and "ui://Extend_Poker_SuoHaNew/Spring" or "ui://Extend_Poker_SuoHaNew/Win_Mine"
else
local beigang = false
if #self:GetSpringSeats(info) > 0 then
for i = 1, #self:GetSpringSeats(info) do
if self:GetSpringSeats(info)[i] == self._room.self_player.seat then
local url = "ui://Extend_Poker_SuoHa/spring2"
local url = "ui://Extend_Poker_SuoHaNew/spring2"
self.WinItem_view = UIPackage.CreateObjectFromURL(url)
self._view:AddChild(self.WinItem_view)
self.WinItem_view:Center()
@ -957,10 +917,10 @@ function M:EventInit()
local num = player.hp_info.total_hp
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_score').text = "+" .. d2ad(player.hp_info.total_hp)
head_info._view:GetChild('text_jifen').text = "+" .. d2ad(player.hp_info.total_hp)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_score').text = d2ad(player.hp_info.total_hp)
head_info._view:GetChild('text_jifen').text = d2ad(player.hp_info.total_hp)
end
card_info:PlayScore(d2ad(player.hp_info.round_actual_hp), false, win_seat == player.seat)
else
@ -985,10 +945,10 @@ function M:EventInit()
self:ChangeBgmMusic(1)
-- if over == 0 then
if #self:GetSpringSeats(info) > 0 then
-- -- print("222222222222222222")
-- print("222222222222222222")
coroutine.wait(1)
else
-- -- print("333333333333333333")
-- print("333333333333333333")
-- coroutine.wait(2)
end
@ -1082,6 +1042,7 @@ function M:ReConnectForStart()
self._state.selectedIndex = 1
self._view:GetController("time").selectedIndex = self:GetPos(self._room.curren_turn_seat)
self:UpdateRound(self._room.curren_round)
for _, player in ipairs(self._room.player_list) do
local player_card_info = self._player_card_info[self:GetPos(player.seat)]
local head_info = self._player_info[self:GetPos(player.seat)]
@ -1094,10 +1055,10 @@ function M:ReConnectForStart()
local num = player.hp_info.total_hp
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_score').text = '+' .. d2ad(player.hp_info.total_hp)
head_info._view:GetChild('text_jifen').text = '+' .. d2ad(player.hp_info.total_hp)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_score').text = d2ad(player.hp_info.total_hp)
head_info._view:GetChild('text_jifen').text = d2ad(player.hp_info.total_hp)
end
else
local rt = 1
@ -1166,10 +1127,10 @@ function M:ReconnectForClearing()
local num = player.hp_info.total_hp
if num > 0 then
head_info._view:GetController('text_color').selectedIndex = 0
head_info._view:GetChild('text_score').text = '+' .. d2ad(player.hp_info.total_hp)
head_info._view:GetChild('text_jifen').text = '+' .. d2ad(player.hp_info.total_hp)
else
head_info._view:GetController('text_color').selectedIndex = 1
head_info._view:GetChild('text_score').text = d2ad(player.hp_info.total_hp)
head_info._view:GetChild('text_jifen').text = d2ad(player.hp_info.total_hp)
end
-- player_card_info:PlayScore(d2ad(player.hp_info.round_actual_hp))
else
@ -1245,20 +1206,20 @@ function M:ReconnectForClearing()
local flow = newremaincards[i] % 10
local num = (newremaincards[i] - (newremaincards[i] % 10)) / 10
local card_n = flow * 100 + num
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHa", "poker6")
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHaNew", "poker6")
--local code = self:ChangeCodeByTo(card_n)
-- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card_n)
-- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
local card_code_obj
if DataManager.CurrenRoom.pai == 0 then
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card_n)
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. card_n)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
end
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card_n .. "_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. card_n .. "_1")
end
card_code_obj:SetScale(0.6, 0.6)
poker_item:AddChild(card_code_obj)
@ -1270,7 +1231,7 @@ function M:ReconnectForClearing()
end
function M:CreateRankEff()
self.rank_view = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/rank_eff")
self.rank_view = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/rank_eff")
self._view:AddChild(self.rank_view)
self.rank_view:Center()
self.rank_view:GetTransition("t0"):Play()
@ -1298,8 +1259,8 @@ function M:_Effect(type1, player)
end
local info = self._player_card_info[self:GetPos(player.seat)]
local pNode = info._mask_liangpai
local effect = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/eff_" .. eff_code)
-- local effect = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/eff2_1")
local effect = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/eff_" .. eff_code)
-- local effect = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/eff2_1")
effect.touchable = false
effect:GetTransition("t0"):Play()
-- effect:SetXY((self._view.width - effect.width) / 2,(self._view.hight - effect.hight) / 2)
@ -1311,7 +1272,7 @@ function M:_Effect(type1, player)
if eff_code == 1 then
self.eff_feiji = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/eff_feiji")
self.eff_feiji = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/eff_feiji")
self._view:AddChild(self.eff_feiji)
self.eff_feiji:Center()
self.eff_feiji:GetTransition("t0"):Play()
@ -1400,15 +1361,7 @@ end
function M:UpdateRound(round)
local total_round = self._room.room_config.Times
-- self._text_round.text = string.format("%d / %d 局", round, total_round)
if not self._text_currenRound then
self._text_currenRound = self._view:GetChild('Text_CurrenRound')
end
if not self._text_maxRound then
self._text_maxRound = self._view:GetChild('Text_MaxMaxRound')
end
self._text_currenRound.text = round
self._text_maxRound.text = string.format("/%s局", total_round)
self._text_round.text = string.format("%d / %d 局", round, total_round)
end
function M:GetSoundFileName(type, num, isNewBout)
@ -1466,7 +1419,7 @@ function M:PlayCardEff(card)
-- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card .. "_2")
local card_code_obj
if DataManager.CurrenRoom.pai == 0 then
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. card)
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. card)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card .. "_2")
end
@ -1503,7 +1456,7 @@ end
function M:PlaySound(sex, path)
local sex_path = ViewUtil.Sex_Chat[sex] -- 1 男 2 女
local sound_path = string.format("extend/poker/suoha/sound/%s/%s.mp3", sex_path, path)
ViewUtil.PlaySound("SuoHa_PK", sound_path)
ViewUtil.PlaySound("SuoHaNew_PK", sound_path)
end
function M:ChangeBgmMusic(bgm_index)
@ -1512,7 +1465,7 @@ function M:ChangeBgmMusic(bgm_index)
else
self.bgm_index = bgm_index
end
ViewUtil.PlayMuisc("SuoHa_PK", string.format("extend/poker/suoha/sound/bgm%d.mp3", 1))
ViewUtil.PlayMuisc("SuoHaNew_PK", string.format("extend/poker/suoha/sound/bgm%d.mp3", 1))
end
function M:OnPlayerEnter(...)
@ -1568,7 +1521,7 @@ function M:Destroy()
end
end
PKMainView.Destroy(self)
UIPackage.RemovePackage("extend/poker/suoha/ui/Extend_Poker_SuoHa")
UIPackage.RemovePackage("extend/poker/suoha/ui/Extend_Poker_SuoHaNew")
end
return M

16
lua_probject/extend_project/extend/poker/suoha/SuoHa_PlayerBackView.lua
View File

@ -20,9 +20,9 @@ local SuoHa_Record_Event = {
local default_bg = 1
local bg_config = {
{ id = 1, url = 'extend/poker/suoha/bg/bg1', thumb = 'ui://Extend_Poker_SuoHa/table_bg1' },
{ id = 2, url = 'extend/poker/suoha/bg/bg2', thumb = 'ui://Extend_Poker_SuoHa/table_bg2' },
{ id = 3, url = 'extend/poker/suoha/bg/bg3', thumb = 'ui://Extend_Poker_SuoHa/table_bg3' }
{ id = 1, url = 'extend/poker/suoha/bg/bg1', thumb = 'ui://Extend_Poker_SuoHaNew/table_bg1' },
{ id = 2, url = 'extend/poker/suoha/bg/bg2', thumb = 'ui://Extend_Poker_SuoHaNew/table_bg2' },
{ id = 3, url = 'extend/poker/suoha/bg/bg3', thumb = 'ui://Extend_Poker_SuoHaNew/table_bg3' }
}
--- Create a new
@ -41,8 +41,8 @@ function M:InitView(url)
room.self_player = room:GetPlayerBySeat(1)
end
self._gamectr = ControllerManager.GetController(GameController)
UIPackage.AddPackage('extend/poker/suoha/ui/Extend_Poker_SuoHa')
PKPlayBackView.InitView(self, 'ui://Extend_Poker_SuoHa/SuoHa_Main_' .. self._room.room_config.people_num,
UIPackage.AddPackage('extend/poker/suoha/ui/Extend_Poker_SuoHaNew')
PKPlayBackView.InitView(self, 'ui://Extend_Poker_SuoHaNew/SuoHa_Main_' .. self._room.room_config.people_num,
default_bg, bg_config)
self._tex_round = self._view:GetChild('round')
self._player_card_info = {}
@ -95,7 +95,7 @@ function M:NewPlayerPokerInfoView(view, index)
end
function M:FillRoomData(data)
-- print("hidezhanji 1111")
print("hidezhanji 1111")
self._currentStep = 1
local room = DataManager.CurrenRoom
local _player_card_info = self._player_card_info
@ -110,13 +110,13 @@ function M:FillRoomData(data)
local head_info = self._player_info[self:GetPos(p.seat)]
if p.total_hp then
-- print("hidezhanji 2222")
print("hidezhanji 2222")
head_info._view:GetChild('zhanji').visible = false
if room.hpOnOff == 1 or room:checkHpNonnegative() then
head_info._view:GetChild('zhanji').visible = true
head_info._view:GetChild('text_score').text = d2ad(p.total_hp)
head_info._view:GetChild('text_jifen').text = d2ad(p.total_hp)
end
end
head_info:FillData(p)

235
lua_probject/extend_project/extend/poker/suoha/SuoHa_PlayerPokerInfoView.lua
View File

@ -37,116 +37,10 @@ function M:init()
self.text_bomb_score = view:GetChild("Score")
self.ani_bomb_score = view:GetTransition("score")
self.ani_result_score = view:GetTransition("score_1")
------------------------------lingmeng------------------------
self._view_Out = self._view:GetChild('List_Out')
--------------------------------------------------------------
end
-- function M:SetOutCardInfo(cardlist, isPass, isAnim)
-- self.outpoker_list:RemoveChildren(0, -1, true)
-- if cardlist == nil then
-- if isPass == true then
-- self.ctr_outpoker.selectedIndex = 2
-- else
-- self.ctr_outpoker.selectedIndex = 0
-- end
-- else
-- if isAnim then
-- if self.move_cor then
-- coroutine.stop(self.move_cor)
-- self.move_cor = nil
-- end
-- local time = 0.1
-- for i = 1, #cardlist do
-- local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHa", "poker7")
-- local code = self:ChangeCodeByTo(cardlist[i])
-- -- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/"..code)
-- -- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
-- local card_code_obj
-- -- if DataManager.CurrenRoom.pai==0 then
-- -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/"..code)
-- -- else
-- -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
-- -- end
-- -- if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
-- -- -- body
-- -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/"..code.."_1")
-- -- end
-- if DataManager.CurrenRoom.pai == 0 then
-- if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
-- -- body
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_1")
-- else
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code)
-- end
-- else
-- if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
-- -- body
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_2")
-- else
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
-- end
-- end
-- if card_code_obj == nil then
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00")
-- end
-- poker_item:AddChild(card_code_obj)
-- --local poker = self:CreatPoker(cardlist[i],0.7)
-- self.outpoker_list:AddChild(poker_item)
-- poker_item.xy = Vector2.New(self.out_card_data["start_x"], self.out_card_data["start_y"])
-- poker_item:TweenMove(
-- self:GetOutCardEndPokerPos(i, #cardlist, self.outpoker_list, poker_item, self.out_card_data
-- ["maxcount_x"], 1.5), time)
-- --card_code_obj
-- -- self.tween = TweenUtils.TweenFloat(1,0.7,time,function(x)
-- -- card_code_obj:SetScale(x,x)
-- -- end)
-- card_code_obj:SetScale(1.5, 1.5)
-- end
-- self.move_cor = coroutine.start(function()
-- coroutine.wait(0.1)
-- ViewUtil.PlaySound("SuoHa_PK", "extend/poker/suoha/sound/chupai.mp3")
-- end)
-- else
-- for i = 1, #cardlist do
-- local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHa", "poker7")
-- local code = self:ChangeCodeByTo(cardlist[i])
-- local card_code_obj
-- if DataManager.CurrenRoom.pai == 0 then
-- if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
-- -- body
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_1")
-- else
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code)
-- end
-- else
-- if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
-- -- body
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_2")
-- else
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
-- end
-- end
-- if card_code_obj == nil then
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00")
-- end
-- card_code_obj:SetScale(1.5, 1.5)
-- poker_item:AddChild(card_code_obj)
-- --local poker = self:CreatPoker(cardlist[i],0.7)
-- self.outpoker_list:AddChild(poker_item)
-- poker_item.xy = self:GetOutCardEndPokerPos(i, #cardlist, self.outpoker_list, poker_item,
-- self.out_card_data["maxcount_x"], 1.5)
-- end
-- end
-- --self.ctr_outpoker.selectedIndex = 1
-- end
-- end
function M:SetOutCardInfo(cardlist, isPass, isAnim)
self._view_Out:RemoveChildren(0, -1, true)
self.outpoker_list:RemoveChildren(0, -1, true)
if cardlist == nil then
if isPass == true then
self.ctr_outpoker.selectedIndex = 2
@ -154,33 +48,95 @@ function M:SetOutCardInfo(cardlist, isPass, isAnim)
self.ctr_outpoker.selectedIndex = 0
end
else
self.ctr_outpoker.selectedIndex = 1
if isAnim then
if self.move_cor then
coroutine.stop(self.move_cor)
self.move_cor = nil
end
local time = 0.1
for i = 1, #cardlist do
local poker_item = self._view_Out:AddItemFromPool()
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHaNew", "poker7")
local code = self:ChangeCodeByTo(cardlist[i])
self:FillPoker(poker_item, "", cardlist[i])
-- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/"..code)
-- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
local card_code_obj
-- if DataManager.CurrenRoom.pai==0 then
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/"..code)
-- else
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
-- end
-- if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- -- body
-- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/"..code.."_1")
-- end
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_1")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
end
if card_code_obj == nil then
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00")
end
--card_code_obj:SetScale(1,1)
poker_item:AddChild(card_code_obj)
--local poker = self:CreatPoker(cardlist[i],0.7)
self.outpoker_list:AddChild(poker_item)
poker_item.xy = Vector2.New(self.out_card_data["start_x"], self.out_card_data["start_y"])
poker_item:TweenMove(
self:GetOutCardEndPokerPos(i, #cardlist, self.outpoker_list, poker_item, self.out_card_data
["maxcount_x"], 1), time)
--card_code_obj
-- self.tween = TweenUtils.TweenFloat(1,0.7,time,function(x)
-- card_code_obj:SetScale(x,x)
-- end)
card_code_obj:SetScale(0.7, 0.7)
end
self.move_cor = coroutine.start(function()
coroutine.wait(0.1)
ViewUtil.PlaySound("SuoHa_PK", "extend/poker/suoha/sound/chupai.mp3")
ViewUtil.PlaySound("SuoHaNew_PK", "extend/poker/suoha/sound/chupai.mp3")
end)
else
for i = 1, #cardlist do
local poker_item = self._view_Out:AddItemFromPool()
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHaNew", "poker7")
local code = self:ChangeCodeByTo(cardlist[i])
self:FillPoker(poker_item, "", cardlist[i])
local card_code_obj
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_1")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
end
if card_code_obj == nil then
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00")
end
card_code_obj:SetScale(0.7, 0.7)
poker_item:AddChild(card_code_obj)
--local poker = self:CreatPoker(cardlist[i],0.7)
self.outpoker_list:AddChild(poker_item)
poker_item.xy = self:GetOutCardEndPokerPos(i, #cardlist, self.outpoker_list, poker_item,
self.out_card_data["maxcount_x"], 1)
end
end
--self.ctr_outpoker.selectedIndex = 1
end
end
@ -195,7 +151,7 @@ function M:GetOffSet(cardLength) -- 15 -70
if cardLength > 8 then
return 52 --40
else
return -cardLength * -10 + 60
return -cardLength * 5 + 80
end
end
@ -218,7 +174,7 @@ function M:GetOutCardEndFirstPokerPos(count, parent_com, poker_obj, max_count, s
end
function M:GetOutCardEndPokerPos(index, count, parent_com, poker_obj, max_count, scale)
local offset_x, offset_y = self:GetOffSet(count), -100
local offset_x, offset_y = self:GetOffSet(count), -50
local start_pos = self:GetOutCardEndFirstPokerPos(count, parent_com, poker_obj, max_count, scale)
local poker_width, poker_height = poker_obj.width * scale, poker_obj.height * scale
local parent_width, parent_height = parent_com.width, parent_com.height
@ -227,7 +183,6 @@ function M:GetOutCardEndPokerPos(index, count, parent_com, poker_obj, max_count,
pos_x = (index - max_count - 1) * offset_x
pos_y = pos_y + poker_height + offset_y
end
return Vector2.New(pos_x, pos_y)
end
@ -332,33 +287,22 @@ function M:SetRemainCardNumber(isPlay)
--end
end
function M:FillPoker(poker, prefix, num)
num = self:ChangeCodeByTo(num)
local suffix = num == 310 and (DataManager.CurrenRoom.pai == 0 and "_1" or "_2") or ""
num = num == 1 and "00" or num
if not poker.icon then
poker:GetChild('icon').url = string.format("ui://Extend_Poker_SuoHa/%s%s%s", prefix, num, suffix)
else
poker.icon = string.format("ui://Extend_Poker_SuoHa/%s%s%s", prefix, num, suffix)
end
end
function M:CreatPoker1(poker, scale, bank)
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHa", "poker" .. scale * 10)
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHaNew", "poker" .. scale * 10)
local code = self:ChangeCodeByTo(poker)
local card_code_obj
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_1")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code)
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@ -374,20 +318,21 @@ function M:CreatPoker1(poker, scale, bank)
end
function M:CreatPoker(poker, scale, bank)
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHa", "poker" .. 12.5)
local poker_item = UIPackage.CreateObject("Extend_Poker_SuoHaNew", "poker" .. 12.5)
local code = self:ChangeCodeByTo(poker)
local card_code_obj
if DataManager.CurrenRoom.pai == 0 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_1")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_1")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code)
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code .. "_2")
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@ -395,6 +340,7 @@ function M:CreatPoker(poker, scale, bank)
if card_code_obj == nil or bank == 1 then
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/00")
end
card_code_obj:SetScale(scale, scale)
poker_item:AddChild(card_code_obj)
@ -416,7 +362,6 @@ function M:Clear()
self:SetOutCardInfo(nil, false)
self.hand_card_list:RemoveChildren(0, -1, true)
self._mask_liangpai:RemoveChildren(0, -1, true)
self._view_Out:RemoveChildren(0, -1, true)
end
function M:Destroy()

1053
lua_probject/extend_project/extend/poker/suoha/SuoHa_PlayerSelfPokerInfoView.lua
View File

File diff suppressed because it is too large Load Diff

11
lua_probject/extend_project/extend/poker/suoha/SuoHa_ResultView.lua
View File

@ -17,7 +17,7 @@ function SuoHa_ResultView.new(blur_view, data, roomid, over, win_seat, dissolve,
self._close_zone = false
--self._blur_view = blur_view
self._gamectr = ControllerManager.GetController(GameController)
self:init("ui://Extend_Poker_SuoHa/clearing", data, roomid, over, win_seat, dissolve, remaincards)
self:init("ui://Extend_Poker_SuoHaNew/clearing", data, roomid, over, win_seat, dissolve, remaincards)
return self
end
@ -91,7 +91,7 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
return a % 100 < b % 100
end)
for i = 1, #remaincards do
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. remaincards[i])
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. remaincards[i])
leftCardAll:AddChild(card_code_obj)
end
end
@ -99,7 +99,7 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
for i = 1, #data do
local player = data[i]
local item = list_view:AddItemFromPool("ui://Extend_Poker_SuoHa/clearing_item_1")
local item = list_view:AddItemFromPool("ui://Extend_Poker_SuoHaNew/clearing_item_1")
local leftCard = item:GetChild("leftCard")
@ -111,7 +111,7 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
for j = 1, #data[i].handCards do
local code = data[i].handCards[j]
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code)
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code)
leftCard:AddChild(card_code_obj)
end
@ -123,8 +123,7 @@ function M:InitData_One(data, winseat, over, roomid, remaincards)
for k = 1, #data[i].outCards do
local code = data[i].outCards[k]
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/" .. code)
print("==================================================card_code_obj", card_code_obj, code)
local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/" .. code)
leftCard:AddChild(card_code_obj)
card_code_obj:GetChildAt(0):GetChildAt(0).color = Color(0.7, 0.7, 0.7)
end

111
lua_probject/extend_project/extend/poker/suoha/SuoHa_RightPanelView.lua
View File

@ -4,54 +4,49 @@ local M = SuoHa_RightPanelView
local function __init(self, mainView, view)
local right_panel = view
local btn_setting = mainView._view:GetChild("Btn_Setting")
local btn_setting = right_panel:GetChild("btn_setting")
btn_setting.onClick:Set(function()
print("lingmengmainview", mainView.dismiss_room_cd_time)
local _settingView = mainView:NewSettingView()
_settingView.stateIndex = (mainView._room.curren_round >= 1 and mainView._allow_dissmiss) and 2 or 1
_settingView.cd_time = mainView.dismiss_room_cd_time
_settingView:Show()
local room = DataManager.CurrenRoom
_settingView.onCallback:Add(function(context)
local _gamectr = ControllerManager.GetController(GameController)
if (room.CurnrenState == StateType.Ready) then
_gamectr:LevelRoom(function(response)
if (response.ReturnCode == 0) then
ViewManager.ChangeView(ViewManager.View_Lobby)
GameApplication.Instance:ShowTips("房间已解散！")
end
end)
else
print("mainView.dismiss_room_cd_time" .. mainView.dismiss_room_cd_time)
if mainView.dismiss_room_cd_time > 0 then
GameApplication.Instance:ShowTips("您还处于解散冷却时间当中，请稍后重试！")
else
_gamectr:AskDismissRoom()
end
end
end)
end)
-- btn_setting.onClick:Set(function()
-- local _settingView = mainView:NewSettingView()
-- _settingView.stateIndex = (mainView._room.curren_round >= 1 and mainView._allow_dissmiss) and 2 or 1
-- _settingView.cd_time = mainView.dismiss_room_cd_time
-- _settingView:Show()
-- local room = DataManager.CurrenRoom
-- _settingView.onCallback:Add(function(context)
-- local _gamectr = ControllerManager.GetController(GameController)
-- if (room.CurnrenState == StateType.Ready) then
-- _gamectr:LevelRoom(function(response)
-- if (response.ReturnCode == 0) then
-- ViewManager.ChangeView(ViewManager.View_Lobby)
-- GameApplication.Instance:ShowTips("房间已解散！")
-- end
-- end)
-- else
-- -- print("mainView.dismiss_room_cd_time"..mainView.dismiss_room_cd_time)
-- if mainView.dismiss_room_cd_time > 0 then
-- GameApplication.Instance:ShowTips("您还处于解散冷却时间当中，请稍后重试！")
-- else
-- _gamectr:AskDismissRoom()
-- end
-- end
-- end)
-- end)
self._tex_data = right_panel:GetChild("tex_data")
self._tex_time = right_panel:GetChild("tex_time")
self._pb_batteryLevel = right_panel:GetChild("pb_batteryLevel")
self._xinhao = right_panel:GetController("xinhao")
self.ctr_xh = right_panel:GetChild("gcm_xinhao"):GetController("c1")
self.ctr_wifi = right_panel:GetChild("gcm_wifi"):GetController("c1")
self._tex_ping = right_panel:GetChild("gcm_xinhao"):GetChild("n7")
-- self._tex_data = right_panel:GetChild("tex_data")
self._tex_time = mainView._view:GetChild("Text_Time")
self._pb_batteryLevel = mainView._view:GetChild("PB_Battery")
-- self._xinhao = right_panel:GetController("xinhao")
-- self.ctr_xh = right_panel:GetChild("gcm_xinhao"):GetController("c1")
-- self.ctr_wifi = right_panel:GetChild("gcm_wifi"):GetController("c1")
-- self._tex_ping = right_panel:GetChild("gcm_xinhao"):GetChild("n7")
-- self.ctr_log = right_panel:GetController("log")
-- local btn_log = right_panel:GetChild("btn_log")
-- btn_log.onClick:Set(function()
-- if self.onLogCallback then
-- self.onLogCallback()
-- end
-- end)
self.ctr_log = right_panel:GetController("log")
local btn_log = right_panel:GetChild("btn_log")
btn_log.onClick:Set(function()
if self.onLogCallback then
self.onLogCallback()
end
end)
self._total_time = 0
self:__UpdateTime()
@ -68,27 +63,27 @@ function SuoHa_RightPanelView.new(mainView, view)
end
function M:__UpdateTime()
-- self._tex_data.text = os.date("%Y-%m-%d")
self._tex_data.text = os.date("%Y-%m-%d")
self._tex_time.text = os.date("%H:%M")
if Application.platform == RuntimePlatform.IPhonePlayer or Application.platform == RuntimePlatform.Android then
self._pb_batteryLevel.value = GameApplication.Instance:GetBatteryLevel()
end
-- local NetworkReachability = UnityEngine.NetworkReachability
-- local _client = ControllerManager.GameNetClinet
-- if not _client then return end
-- local ping = _client:getAveragePingTime()
-- if not ping then return end
-- ping = math.floor(ping / 2)
-- if ping > 300 then ping = 300 end
-- if ping <= 100 then
-- self.ctr_xh.selectedIndex = 0
-- elseif ping <= 300 then
-- self.ctr_xh.selectedIndex = 1
-- else
-- self.ctr_xh.selectedIndex = 2
-- end
-- self._tex_ping.text = ping .. "ms"
local NetworkReachability = UnityEngine.NetworkReachability
local _client = ControllerManager.GameNetClinet
if not _client then return end
local ping = _client:getAveragePingTime()
if not ping then return end
ping = math.floor(ping / 2)
if ping > 300 then ping = 300 end
if ping <= 100 then
self.ctr_xh.selectedIndex = 0
elseif ping <= 300 then
self.ctr_xh.selectedIndex = 1
else
self.ctr_xh.selectedIndex = 2
end
self._tex_ping.text = ping .. "ms"
end
return M

2
lua_probject/extend_project/extend/poker/suoha/SuoHa_RoomConfig.lua
View File

@ -471,7 +471,7 @@ function M:GetDes(sp)
end
function M:GetGameJS()
local gamerulepanel = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHa/gamerule")
local gamerulepanel = UIPackage.CreateObjectFromURL("ui://Extend_Poker_SuoHaNew/gamerule")
return gamerulepanel
end

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 MiB

92
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas0.png.meta Normal file
View File

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

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas_ckvb2u.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 904 KiB

92
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas_ckvb2u.png.meta Normal file
View File

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

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb1r.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb1r.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: cf8ebb46e2bdd6248b181e9a5f78eddb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb1u.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb1u.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: a3019afdf6874a64db72f7346e90a33d
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb29.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb29.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: d45fcf90eb4ce354d9910e0955cf64df
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb2g.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb2g.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 67c9a377ede37144280f4e9585b15a96
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb2n.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvb2n.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 70fc7669ab24e0d48a0748ab7c6073eb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvbbv.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvbbv.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: e54d3292bc1c80f499f42d9dd19d3281
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvbbw.mp3 Normal file
View File

Binary file not shown.

22
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_ckvbbw.mp3.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 627e4c27f10c04244bdb15c9be3a1edd
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_fui.bytes Normal file
View File

Binary file not shown.

7
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_fui.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4b618ab93186a8847819d82d0c80a2f3
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_atlas0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 57 KiB

92
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_atlas0.png.meta Normal file
View File

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

BIN
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_fui.bytes Normal file
View File

Binary file not shown.

7
wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_fui.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3f81bf2b173f7084a9432868eaadd9fd
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: