diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua
index 0b7d099e..69ea9a41 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameInfo.lua
@@ -89,6 +89,7 @@ function M:SelectedConfigData()
local daniao = _config:GetController('daniao').selectedIndex --多少起胡 0:6,1:10,2:15
+ local fengding = _config:GetController('fengding').selectedIndex+1 --多少起胡 0:6,1:10,2:15
--名堂--
local tiandihu = _config:GetChild('btn_tiandihu').selected
local honghu = _config:GetChild('btn_honghu').selected
@@ -128,7 +129,7 @@ function M:SelectedConfigData()
_data['haidiliao'] = haidihu --海底胡
_data['kahu'] = kahu --卡胡
_data['mingwei'] = mingwei --明偎
-
+ _data['fengding'] = fengding
@@ -162,6 +163,7 @@ function M:LoadConfigData(data)
_config:GetController('choupai').selectedIndex = data.choupai --抽牌
_config:GetController('hunum').selectedIndex = data.hunum --起胡息
_config:GetController('daniao').selectedIndex = data.daniao --打鸟 0不打，1:10,2:20,3:50
+ _config:GetController('fengding').selectedIndex = data.fengding-1
_config:GetChild('btn_tiandihu').selected = data.tiandihu --天地胡
_config:GetChild('btn_honghu').selected = data.honghu --红胡
@@ -173,6 +175,7 @@ function M:LoadConfigData(data)
_config:GetChild('btn_kahu').selected = data.kahu --卡胡
_config:GetChild('btn_mingwei').selected = data.mingwei --明偎
+
if oldGameVersion==2 then
self.xipaiValueText.text=data.xi_pai_score/1000
self.xipaiValue=data.xi_pai_score/1000
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
index 52e9c097..99abf162 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
@@ -729,17 +729,25 @@ function M:__TipAction(context)
local td = data[2]
local tip_hu = data[3]
local list = tip.tip_map_type[td.weight]
- printlog("tipaction :")
- pt(list)
- printlog(list[1]['bi_list']==nil)
+
if (#list > 1) or td.type == 1 then
- if list[1]['bi_list']==nil then
+ local chiflag = true
+ for key, value in pairs(list) do
+ if value['bi_list'] ~=nil then
+ chiflag = false
+ end
+ end
+ if #list>1 then
+ chiflag = false
+ end
+ if chiflag then
_gamectr:SendAction(list[1]["id"])
self:__CloseTip()
local info = self._player_card_info[1]
info:UpdateIsOnClick(false)
return
end
+
self:_ChiView(
list,
tip_hu,
@@ -764,7 +772,7 @@ function M:__TipAction(context)
end
end
)
- --self._chipeng_tip.visible = false
+ -- self._chipeng_tip.visible = false
return
end
if tip_hu and td.type ~= 8 then
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua
index 7d584b6c..ddcdda08 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua
@@ -1149,7 +1149,7 @@ local function init(self,cardInhand,index)
self.cardList = membe_clone(cardInhand)
table.sort(self.cardList)
if index== nil or index ==0 then
- return self:tryPendulumRule2()
+ return self:tryPendulumRule()
elseif index == 1 then
return self:tryPendulumRule()
elseif index == 2 then
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml b/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml
index 9a782c0e..066f1784 100644
--- a/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml
+++ b/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml
@@ -11,6 +11,7 @@
+
@@ -60,83 +61,98 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/ArtifactDB b/wb_unity_pro_2/Library/ArtifactDB
index 17928512..d37df934 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 8839d4ae..829c3d28 100644
--- a/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
+++ b/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
@@ -14,10 +14,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
- x: 1.3333334
- y: 50
- width: 876.6667
- height: 860.6667
+ x: -44
+ y: 64
+ width: 906
+ height: 854.6667
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 4}
@@ -34,24 +34,24 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ConsoleWindow
+ m_Name: ProjectBrowser
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 387
- width: 877
- height: 424
- m_MinSize: {x: 101, y: 121}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 9}
+ y: 383
+ width: 906
+ height: 422
+ m_MinSize: {x: 230, y: 271}
+ m_MaxSize: {x: 10000, y: 10021}
+ m_ActualView: {fileID: 11}
m_Panes:
- {fileID: 9}
- {fileID: 10}
- {fileID: 11}
- m_Selected: 0
- m_LastSelected: 2
+ m_Selected: 2
+ m_LastSelected: 0
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -71,10 +71,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 877
- height: 811
- m_MinSize: {x: 201, y: 342}
- m_MaxSize: {x: 4001, y: 8042}
+ width: 906
+ height: 805
+ m_MinSize: {x: 230, y: 492}
+ m_MaxSize: {x: 10000, y: 14042}
vertical: 1
controlID: 35
--- !u!114 &4
@@ -97,8 +97,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 877
- height: 861
+ width: 906
+ height: 855
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &5
@@ -118,7 +118,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 877
+ width: 906
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -141,10 +141,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
- width: 877
- height: 811
- m_MinSize: {x: 201, y: 342}
- m_MaxSize: {x: 4001, y: 8042}
+ width: 906
+ height: 805
+ m_MinSize: {x: 230, y: 492}
+ m_MaxSize: {x: 10000, y: 14042}
vertical: 0
controlID: 34
--- !u!114 &7
@@ -163,8 +163,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 841
- width: 877
+ y: 835
+ width: 906
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -185,10 +185,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 877
- height: 387
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
+ width: 906
+ height: 383
+ m_MinSize: {x: 200, y: 221}
+ m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 13}
@@ -216,10 +216,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 1.3333334
- y: 467.33334
- width: 876
- height: 403
+ x: 48.666668
+ y: 473.33334
+ width: 906
+ height: 401
m_ViewDataDictionary: {fileID: 0}
--- !u!114 &10
MonoBehaviour:
@@ -297,10 +297,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 6
- y: 464.6667
- width: 876
- height: 400
+ x: -44
+ y: 477.33334
+ width: 906
+ height: 401
m_ViewDataDictionary: {fileID: 0}
m_SearchFilter:
m_NameFilter:
@@ -314,7 +314,8 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SkipHidden: 0
m_SearchArea: 1
- m_Folders: []
+ m_Folders:
+ - Assets/ART/base/lobby/ui
m_ViewMode: 0
m_StartGridSize: 64
m_LastFolders: []
@@ -351,10 +352,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
- scrollPos: {x: 0, y: 1380}
+ scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
+ m_ExpandedIDs: ffffffff00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -431,10 +432,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 1.3333334
- y: 80
- width: 876
- height: 366
+ x: -44
+ y: 94
+ width: 906
+ height: 362
m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: []
m_SerializedViewValues: []
@@ -471,7 +472,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 0
+ m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -480,23 +481,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 876
- height: 345
- m_Scale: {x: 0.47916666, y: 0.47916666}
- m_Translation: {x: 438, y: 172.5}
+ width: 906
+ height: 341
+ m_Scale: {x: 0.47361112, y: 0.47361112}
+ m_Translation: {x: 453, y: 170.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -914.087
+ x: -956.48096
y: -360
- width: 1828.174
+ width: 1912.9619
height: 720
m_MinimalGUI: 1
- m_defaultScale: 0.47916666
- m_LastWindowPixelSize: {x: 1314, y: 549}
+ m_defaultScale: 0.47361112
+ m_LastWindowPixelSize: {x: 1359, y: 543}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000001000000000000
diff --git a/wb_unity_pro_2/Library/SceneVisibilityState.asset b/wb_unity_pro_2/Library/SceneVisibilityState.asset
index 98749ca5..86cae906 100644
Binary files a/wb_unity_pro_2/Library/SceneVisibilityState.asset and b/wb_unity_pro_2/Library/SceneVisibilityState.asset differ
diff --git a/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll b/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll
index c9e3638b..593dc980 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 e17f789d..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 510dcd31..81bcf903 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 ab5e9c24..9a9256c6 100644
--- a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -1,2 +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