diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua
index 17fb6209..b9979415 100644
--- a/lua_probject/base_project/Game/View/MainView.lua
+++ b/lua_probject/base_project/Game/View/MainView.lua
@@ -343,6 +343,17 @@ function M:InitView(url, isHideIpAdds)
)
end--]]
+ local btn_leave_lobby = _view:GetChild('btn_leave_lobby')
+ if btn_leave_lobby ~= nil then
+ btn_leave_lobby.onClick:Set(
+ function()
+ self._gamectr.tmpRoomID = self._room.room_id
+ self._gamectr.tmpGroupID = self._room.group_id
+ ViewManager.ChangeView(ViewManager.View_Lobby)
+ end
+ )
+ end
+
UpdateBeat:Add(self.OnUpdate, self)
if self._room.room_config.people_num <= 4 and self._room.room_config.people_num >= 3 and self._gamectr:CheckGPS() then
self._show_distance = true
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua
index f10c2e38..b7e5b027 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua
@@ -64,12 +64,12 @@ MngPageConfig.Config = {
{
-- 盟主
--{19, 16, 7, 3, 8, 9, 13, 17},
- { 9, 17, 16, 7 },
+ { 9, 14, 17, 16, 7 },
-- 管理员
--{19, 16, 7, 3, 8, 9, 13, 17},
- { 9, 17, 16, 7 },
+ { 9, 14, 17, 16, 7 },
-- 合伙人
- { 17, 16, 7 },
+ { 14,17, 16, 7 },
--{19,16,7, 8,17,22},
-- 普通玩家
--{9, 17},
diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua
index 2ee052c4..213c36ec 100644
--- a/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua
@@ -159,6 +159,11 @@ function M:SelectedConfigData()
if _config:GetChild("btn_wuhongzhongzimo") then
wuguijiabei = _config:GetChild("btn_wuhongzhongzimo").selected
end
+
+ local dianpaohu = false
+ if _config:GetChild("btn_dianpaohu") then
+ dianpaohu = _config:GetChild("btn_dianpaohu").selected
+ end
local di_fen=false
if _config:GetController('difen') then
@@ -234,7 +239,7 @@ function M:SelectedConfigData()
_data["fengding_score"] = fengding_score
_data["wuguizhuopaojiabei"] = wuguizhuopaojiabei
-
+ _data["dianpaohu"] = dianpaohu
return _data
end
@@ -262,6 +267,7 @@ function M:LoadConfigData(data)
end
_config:GetController("jiangma").selectedIndex = data.jiangma
+ _config:GetChild("btn_dianpaohu").selected = data.dianpaohu
if _config:GetController("piao") then
_config:GetController("piao").selectedIndex=data.piao_niao
diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua
index 5220a670..15392d92 100644
--- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua
@@ -860,16 +860,16 @@ function M:EventInit()
if DataManager.CurrenRoom.pai == 0 then
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n ..
- "_1")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .."_1")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n)
end
else
if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n ..
- "_2")
+ --card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .."_2")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
end
@@ -1256,10 +1256,10 @@ function M:ReconnectForClearing()
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
end
- if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
+ -- if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. "_1")
- end
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. "_1")
+ -- end
card_code_obj:SetScale(0.6, 0.6)
poker_item:AddChild(card_code_obj)
otherpoker_list:AddChild(poker_item)
diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua
index c8b807f3..de0a09b1 100644
--- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua
@@ -72,14 +72,16 @@ function M:SetOutCardInfo(cardlist, isPass, isAnim)
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_RunFastNew/" .. code .. "_1")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@@ -113,14 +115,16 @@ function M:SetOutCardInfo(cardlist, isPass, isAnim)
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_RunFastNew/" .. code .. "_1")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@@ -295,14 +299,16 @@ function M:CreatPoker1(poker, scale, bank)
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_RunFastNew/" .. code .. "_1")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ --card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
@@ -325,14 +331,16 @@ function M:CreatPoker(poker, scale, bank)
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_RunFastNew/" .. code .. "_1")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2")
+ card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
else
card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2")
end
diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua
index fb5d3952..d185083f 100644
--- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua
@@ -650,14 +650,16 @@ function M:SetOutCardList(cardlist, isAnim)
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_RunFastNew/' .. code .. '_1')
+ -- card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_1')
+ card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code)
else
card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code)
end
else
if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
-- body
- card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_2')
+ --card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_2')
+ card_code_obj = UIPackage.CreateObjectFromURL('ui://Main_Poker/' .. code .. '_2')
else
card_code_obj = UIPackage.CreateObjectFromURL('ui://Main_Poker/' .. code .. '_2')
end
diff --git a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info
index eb6c1fea..2c2377e1 100644
--- a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info
+++ b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info
@@ -1,12 +1,21 @@
{
"objectStatus": {
- "n146_piwz": {
+ "n158_ug6y": {
+ "hidden": true
+ },
+ "n106_t038": {
+ "hidden": true
+ },
+ "n154_j47e": {
"collapsed": true
},
"n122_c4r1": {
"collapsed": true
},
- "n154_j47e": {
+ "n103_t038": {
+ "hidden": true
+ },
+ "n146_piwz": {
"collapsed": true
},
"n136_c4r1": {
@@ -17,6 +26,9 @@
},
"n74_nip5": {
"hidden": true
+ },
+ "n160_ozsy": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml b/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml
index 90548e35..0121a85f 100644
--- a/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml
+++ b/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml
@@ -20,31 +20,31 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -89,6 +89,9 @@
+
+
+
diff --git a/wb_unity_pro_2/Library/ArtifactDB b/wb_unity_pro_2/Library/ArtifactDB
index 90307670..6780d782 100644
Binary files a/wb_unity_pro_2/Library/ArtifactDB and b/wb_unity_pro_2/Library/ArtifactDB differ
diff --git a/wb_unity_pro_2/Library/CurrentLayout-default.dwlt b/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
index 602a8367..ecc5cfc7 100644
--- a/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
+++ b/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
@@ -14,8 +14,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
- x: -8.666667
- y: 58
+ x: -15.333334
+ y: 50
width: 906
height: 854.6667
m_ShowMode: 4
@@ -76,7 +76,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 1
- controlID: 35
+ controlID: 54
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -146,7 +146,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 342}
m_MaxSize: {x: 4000, y: 8042}
vertical: 0
- controlID: 34
+ controlID: 53
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -216,8 +216,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: -8.666667
- y: 471.33334
+ x: -15.333334
+ y: 463.33334
width: 906
height: 401
m_ViewDataDictionary: {fileID: 0}
@@ -252,7 +252,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: ac96c5ffc496c5ff4a9ac5ff5c9ac5ff6a9ac5ff1265c6ffdc65c6ffee65c6ff2c6feaff6a73eaff7c73eaff8a73eaff0890eaff0c90eaff9ebef7ff68bff7ff7abff7ff60fbfffff4ffffff
+ m_ExpandedIDs: 52fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -327,7 +327,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: f03b0000
m_LastClickedID: 15344
- m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000
+ m_ExpandedIDs: 00000000ea2c0000ae360000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000563c0000583c00005a3c00005c3c00005e3c0000603c0000623c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -355,7 +355,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000
+ m_ExpandedIDs: 00000000ea2c0000ae360000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000563c0000583c00005a3c00005c3c00005e3c0000603c0000623c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -432,8 +432,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: -8.666667
- y: 88
+ x: -15.333334
+ y: 80
width: 906
height: 362
m_ViewDataDictionary: {fileID: 0}
diff --git a/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll b/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll
index 7714ae15..b949582a 100644
Binary files a/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll and b/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.pdb b/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.pdb
index a8dd6773..1dfdd17d 100644
Binary files a/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.pdb differ
diff --git a/wb_unity_pro_2/Library/SourceAssetDB b/wb_unity_pro_2/Library/SourceAssetDB
index 5a689a75..04c22ad3 100644
Binary files a/wb_unity_pro_2/Library/SourceAssetDB and b/wb_unity_pro_2/Library/SourceAssetDB differ
diff --git a/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json b/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json
index eb7b9bde..4461fa5f 100644
--- a/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json
+++ b/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json
@@ -1 +1 @@
-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
index e69de29b..9a9256c6 100644
--- a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -0,0 +1,4 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
+Quitting shader compiler process