Merge branch 'master' of http://121.41.95.54:3000/aga/yunque_client2

lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua

@@ -569,6 +569,7 @@ function M:OneventResult1(evt_data)
     local over = evt_data.type
     --0：小结算   1：小大结算    2：大结算
     self._room.playing = false
+   
     if 0 == over then
         local result = evt_data.result
         for i = 1, #self._room.player_list do

lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua

@@ -664,12 +664,18 @@ function M:__FangziTip(tip, _uid,fptype)
     _lit_fanzi:RemoveChildrenToPool()
     local _tlist = table.keys(tip.tip_map_type)
     local tip_hu = false
+    local tip_fanpao = false
+    local tip_id = 0;
     local count = #_tlist
     for k = 1, #_tlist do
         local td = tip.tip_map_type[_tlist[k]][1]
+        
         if td.type == 8 then
             tip_hu = true
+            tip_id = td.id
+          
         end
+        
     end
     
     for k = 1, #_tlist do

lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua

@@ -519,7 +519,7 @@ function M:FillItemData(room, data, item)
             end
         end
     end
-
+    printlog("输了：")
     item:RemoveChildrenToPool()
     for i = 1, #info_list do
         if info_list[i].is_win == false then

wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 522,
+  "libview.firstColumnWidth": 297,
   "expanded_nodes": [
     "27vd145b",
     "/",
@@ -8,51 +8,30 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://ppu1wv76j4mf9j",
     "ui://ppu1wv76j4mf9d",
+    "ui://27vd145bko559b",
+    "ui://niy3ldiwl9mny",
+    "ui://ppu1wv76j4mf9j",
+    "ui://v0j9abjygq7m7w",
+    "ui://vplxondscioehnd",
     "ui://ppu1wv76j4mf9e",
     "ui://ppu1wv76j4mf9f",
+    "ui://niy3ldiwl9mn10",
+    "ui://niy3ldiwl9mn19",
     "ui://ppu1wv76gzvy9q",
-    "ui://v6yvqp7waen81b0"
+    "ui://v6yvqp7waen81b0",
+    "ui://v6yvqp7waen81bf"
   ],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://ppu1wv76j4mf9j",
+  "doc.activeDoc": "ui://27vd145bko559b",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "27vd145b",
+    "vplxonds",
     "/",
-    "27vd145b",
-    "/buttons/",
-    "27vd145b",
-    "/component/",
-    "27vd145b",
-    "/component/head/",
-    "27vd145b",
-    "/component/head/image/",
-    "27vd145b",
-    "/component/share/",
-    "27vd145b",
-    "/component/share/images/",
-    "27vd145b",
-    "/font/",
-    "27vd145b",
-    "/font/images/",
-    "ppu1wv76",
-    "/",
-    "ppu1wv76",
-    "/component/",
-    "ppu1wv76",
-    "/component/cards/",
-    "ppu1wv76",
-    "/component/clearing/",
-    "ppu1wv76",
-    "/component/clearing/image/",
-    "ppu1wv76",
-    "/component/clearing/images/",
-    "ppu1wv76",
-    "/component/effect/"
+    "vplxonds",
+    "/invite/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Main_RunBeard/package.xml

@@ -857,6 +857,7 @@
     <image id="rbpg1h5" name="eff_chi.png" path="/component/chi_peng_effect/" exported="true"/>
     <image id="rbpg1h6" name="eff_hu.png" path="/component/chi_peng_effect/" exported="true"/>
     <image id="rbpg1h7" name="eff_peng.png" path="/component/chi_peng_effect/" exported="true"/>
+    <image id="dbve1h8" name="newop_11.png" path="/component/chi_peng_effect/" exported="true" smoothing="false"/>
   </resources>
   <publish name="Main_RunBeard" path="..\wb_unity_pro\Assets\ART\base\main_zipai\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro_2/Library/CurrentLayout-default.dwlt

@@ -14,14 +14,14 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 944
-    y: 50
-    width: 876.6667
-    height: 860.6667
+    x: -8.666667
+    y: 54.666668
+    width: 875.3334
+    height: 854.6667
   m_ShowMode: 4
   m_Title: 
   m_RootView: {fileID: 4}
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 542}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 0
 --- !u!114 &2
@@ -40,9 +40,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 387
-    width: 877
-    height: 424
+    y: 384
+    width: 876
+    height: 421
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 9}
@@ -71,12 +71,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 877
-    height: 811
+    width: 876
+    height: 805
   m_MinSize: {x: 201, y: 342}
   m_MaxSize: {x: 4001, y: 8042}
   vertical: 1
-  controlID: 54
+  controlID: 35
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -97,9 +97,9 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 877
-    height: 861
-  m_MinSize: {x: 875, y: 300}
+    width: 876
+    height: 855
+  m_MinSize: {x: 875, y: 542}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &5
 MonoBehaviour:
@@ -118,7 +118,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 877
+    width: 876
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -141,12 +141,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 877
-    height: 811
+    width: 876
+    height: 805
   m_MinSize: {x: 201, y: 342}
   m_MaxSize: {x: 4001, y: 8042}
   vertical: 0
-  controlID: 53
+  controlID: 34
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -163,8 +163,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 841
-    width: 877
+    y: 835
+    width: 876
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -185,8 +185,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 877
-    height: 387
+    width: 876
+    height: 384
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 12}
@@ -216,10 +216,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 944
-    y: 467.33334
-    width: 876
-    height: 403
+    x: -8.666667
+    y: 468.6667
+    width: 875
+    height: 400
   m_ViewDataDictionary: {fileID: 0}
 --- !u!114 &10
 MonoBehaviour:
@@ -297,13 +297,13 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 815.3334
-    y: 486.6667
-    width: 875
-    height: 353
+    x: 6
+    y: 464.6667
+    width: 876
+    height: 400
   m_ViewDataDictionary: {fileID: 0}
   m_SearchFilter:
-    m_NameFilter: GObj
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -314,13 +314,12 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders:
-    - Assets/Modules/FairyGUI/Scripts/UI
+    m_Folders: []
   m_ViewMode: 0
   m_StartGridSize: 64
   m_LastFolders: []
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\project\yunque\wb_unity_pro
+  m_LastProjectPath: D:\project\yunque\wb_unity_pro_2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
@@ -353,9 +352,9 @@ MonoBehaviour:
       m_ResourceFile: 
   m_AssetTreeState:
     scrollPos: {x: 0, y: 1380}
-    m_SelectedIDs: ac310000
-    m_LastClickedID: 12716
-    m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: ffffffff00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -380,8 +379,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: ac310000
-    m_LastClickedInstanceID: 12716
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
@@ -432,10 +431,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 944
-    y: 80
-    width: 876
-    height: 366
+    x: -8.666667
+    y: 84.66667
+    width: 875
+    height: 363
   m_ViewDataDictionary: {fileID: 0}
   m_SerializedViewNames: []
   m_SerializedViewValues: []
@@ -481,23 +480,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: 875
+      height: 342
+    m_Scale: {x: 0.47499996, y: 0.475}
+    m_Translation: {x: 437.5, y: 171}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -914.087
+      x: -921.0527
       y: -360
-      width: 1828.174
+      width: 1842.1053
       height: 720
     m_MinimalGUI: 1
-  m_defaultScale: 0.47916666
-  m_LastWindowPixelSize: {x: 1314, y: 549}
+  m_defaultScale: 0.475
+  m_LastWindowPixelSize: {x: 1312.5, y: 544.5}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000001000000000000

wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log

@@ -0,0 +1,2 @@
+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