fangpaofa

.gitignore

@@ -1,2 +1,3 @@
 /wb_unity_pro_2/
-/wb_unity_pro/
+/wb_unity_pro/
+wb_unity_pro_2/

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

@@ -302,7 +302,7 @@ function M:FillItemData(room, data, item)
         self._view:GetChild('show_win').visible = false
         self._view:GetChild('show_low').visible = true
     end
-    printlog("result tuan1")
+
     if Yes_win == true then
         local isWin_Card = true
         local p = room:GetPlayerBySeat(win_data.seat)
@@ -313,30 +313,21 @@ function M:FillItemData(room, data, item)
             self._view:GetController('bank').selectedIndex = 1
         end
         self._view:GetChild('WinerName').text = p.self_user.nick_name
+        self._view:GetChild("WinerID").text = "ID:"..p.self_user.account_id
         --self._view:GetChild('chongtunshu').text = '充囤：' .. room.room_config.tun .. ' 囤'
-        self._view:GetChild('huxi').text = '胡息：' .. win_data.hu_xi
+        self._view:GetChild('huxi').text = '胡     息：+' .. win_data.hu_xi
        -- self._view:GetChild('tunshu').text = '基础囤数：' .. win_data.tun
        -- self._view:GetChild('zongtunshu').text = '总囤数：' .. win_data.total_tun
         if win_data.round_score >= 0 then
             self._view:GetChild('score').text = '总胡息：+' .. win_data.round_score
             self._view:GetChild('score').grayed = false
         else
-            self._view:GetChild('score').text = '总胡息：' .. win_data.round_score
+            self._view:GetChild('score').text = '总胡息：+' .. win_data.round_score
             self._view:GetChild('score').grayed = true
         end
         local hp_info = win_data.hp_info
-        if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then
-            local round_actual_hp = d2ad(hp_info.round_actual_hp) --// 本局实际输赢体力值
-            self._view:GetChild('tili_score').visible = true
-            self._view:GetChild('tili_title').visible = true
-            if (round_actual_hp > 0) then
-                self._view:GetChild('tili_score').text = '积分：+' .. round_actual_hp
-                self._view:GetChild('tili_score').grayed = false
-            else
-                self._view:GetChild('tili_score').text = '积分：' .. round_actual_hp
-                self._view:GetChild('tili_score').grayed = true
-            end
-        end
+        
+        self._view:GetController("hudianpao").selectedIndex = win_data.hu_type
 
         if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then
             local isupper_limit = hp_info.upper_limit --  // 输赢是否已达上限
@@ -346,7 +337,7 @@ function M:FillItemData(room, data, item)
                 self._view:GetChild('yidashangxian').text = ''
             end
         end
-        printlog("result tuan2")
+   
         local btn_head = self._view:GetChild('btn_head')
         ImageLoad.Load(p.self_user.head_url, btn_head._iconObject)
         local fullname_list = self._view:GetChild('fullname_list')
@@ -356,9 +347,9 @@ function M:FillItemData(room, data, item)
                 local dipais = UIPackage.CreateObjectFromURL('ui://Extend_Poker_FanPaoFa/FullName')
                 dipais:GetChild('n0').icon = 'ui://Extend_Poker_FanPaoFa/hu_' .. win_data.mingtang[i].mingtang
                 if win_data.mingtang[i].type == 1 and win_data.mingtang[i].score ~= 0 then
-                    dipais:GetChild('n2').text = win_data.mingtang[i].score .. ' 番'
+                    dipais:GetChild('n2').text = win_data.mingtang[i].score .. ' 息'
                 elseif win_data.mingtang[i].type == 2 and win_data.mingtang[i].score ~= 0 then
-                    dipais:GetChild('n2').text = win_data.mingtang[i].score .. ' 囤'
+                    dipais:GetChild('n2').text = win_data.mingtang[i].score .. ' 番'
                 elseif win_data.mingtang[i].type == 3 and win_data.mingtang[i].score ~= 0 then
                     dipais:GetChild('n2').text = win_data.mingtang[i].score .. ' 倍'
                 end
@@ -551,18 +542,7 @@ function M:FillItemData(room, data, item)
                 player:GetChild('score').grayed = true
             end
             local hp_info = info_list[i].hp_info
-            if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then
-                local round_actual_hp = d2ad(hp_info.round_actual_hp) --// 本局实际输赢体力值
-                player:GetChild('tili_score').visible = true
-                player:GetChild('tili_title').visible = true
-                if (round_actual_hp > 0) then
-                    player:GetChild('tili_score').text = '+' .. round_actual_hp
-                    player:GetChild('tili_score').grayed = false
-                else
-                    player:GetChild('tili_score').text = '' .. round_actual_hp
-                    player:GetChild('tili_score').grayed = true
-                end
-            end
+            player:GetChild("txt_userid").text = p.self_user.account_id
             if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then
                 local isupper_limit = hp_info.upper_limit --  // 输赢是否已达上限
                 if (isupper_limit) then
@@ -649,28 +629,62 @@ function M:FillItemData2(room, data, list)
         end
         player_list[i].entrust = entrust
         player_list[i].param = {}
-        local wcount = 0
-        if (data[i].win_count ~= nil) then
-            wcount = data[i].win_count
+        local wcount = 0 --总胡次数
+
+        if (data[i].hupai_count ~= nil) then
+            wcount = data[i].hupai_count 
         end
-        local hxcount = 0
-        if (data[i].total_huxi ~= nil) then
-            hxcount = data[i].total_huxi
+        local dpcount = 0
+        
+        if (data[i].dianpao_count ~= nil) then
+            dpcount = data[i].dianpao_count 
         end
+
+        local tpcount = 0
+
+        if (data[i].tipai_count ~= nil) then
+            tpcount = data[i].tipai_count 
+        end
+
+        local ppcount = 0
+        if (data[i].paopai_count ~= nil) then
+            ppcount = data[i].paopai_count 
+        end
+
+        local dncount =0
+         if (data[i].niaoscore ~= nil) then
+            dncount = data[i].niaoscore 
+        end
+
         player_list[i].param[1] = {}
         player_list[i].param[1].key = '胡牌次数:'
         player_list[i].param[1].value = tostring(wcount)
-        player_list[i].param[2] = {}
-        player_list[i].param[2].key = '胡息总数:'
-        player_list[i].param[2].value = tostring(hxcount)
-    end
 
+        player_list[i].param[2] = {}
+        player_list[i].param[2].key = '点炮总数:'
+        player_list[i].param[2].value = tostring(dpcount)
+
+        player_list[i].param[3] = {}
+        player_list[i].param[3].key = '提牌总数:'
+        player_list[i].param[3].value = tostring(tpcount)
+
+        player_list[i].param[4] = {}
+        player_list[i].param[4].key = '跑牌总数:'
+        player_list[i].param[4].value = tostring(ppcount)   
+
+        player_list[i].param[5] = {}
+        player_list[i].param[5].key = '鸟分:'
+        player_list[i].param[5].value = tostring(dncount)   
+
+    end
+ 
     local round = room.room_config.round
     self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list)
+    
     self:SetGSListlineGap(5)
 
     self:InitBigResult(room, 26)
-
+    
     DataManager.CurrenRoom = nil
     -- list:RemoveChildrenToPool()
     -- for i =1, #data do

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml

@@ -7,7 +7,7 @@
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="qipai" pages="0,,1," selected="0"/>
   <controller name="xipai" pages="0,,1," selected="0"/>
-  <controller name="hudianpao" pages="0,,1,,2," selected="0"/>
+  <controller name="hudianpao" pages="0,,1,,2," selected="2"/>
   <displayList>
     <component id="n20_pt1r" name="win_base" pkg="27vd145b" src="e6awcd0" fileName="Win_Frame_Old.xml" xy="-5,860" size="1334,750" group="n70_dunj"/>
     <image id="n72_p9qe" name="n72" src="o49p1d3" fileName="component/Main/component/new_ui/di_kuang.png" pkg="v6yvqp7w" xy="23,55" size="1296,687" group="n70_dunj">
@@ -132,7 +132,7 @@
       <item/>
     </list>
     <list id="n32_n1ry" name="dipai_list" xy="167,61" size="1101,64" group="n45_n1ry" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://v6yvqp7wyfzf1h4" vAlign="middle"/>
-    <text id="n39_n1ry" name="huxi" xy="984,133" size="257,41" group="n45_n1ry" fontSize="28" color="#924e00" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="胡息：+133&#xA;"/>
+    <text id="n39_n1ry" name="huxi" xy="989,331" size="257,41" group="n45_n1ry" fontSize="28" color="#924e00" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="胡息：+133&#xA;"/>
     <list id="n46_n1ry" name="fullname_list" xy="224,136" size="143,279" group="n45_n1ry" selectionMode="none" lineGap="5" colGap="-10" defaultItem="ui://ppu1wv76j4mf9n" autoClearItems="true">
       <item/>
       <item/>
@@ -145,7 +145,7 @@
       <item/>
       <item/>
     </list>
-    <text id="n42_n1ry" name="score" xy="984,177" size="256,41" group="n45_n1ry" fontSize="30" color="#924e00" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="总分：+2333&#xA;"/>
+    <text id="n42_n1ry" name="score" xy="986,376" size="256,41" group="n45_n1ry" fontSize="30" color="#924e00" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="总分：+2333&#xA;"/>
     <text id="n56_fnpw" name="222" xy="767,567" size="82,37" group="n58_fnpw" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
     <list id="n62_fnpw" name="qipai_list" xy="955,479" size="298,157" group="n58_fnpw" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
       <item/>
@@ -176,10 +176,10 @@
     <group id="n64_pwj4" name="n64" xy="280,651" size="905,89" group="n70_dunj" advanced="true">
       <gearDisplay controller="button" pages="0"/>
     </group>
-    <image id="n86_rbpg" name="n86" src="rbpg9w" fileName="component/clearing/images/hu.png" xy="1112,227" size="170,170" group="n70_dunj">
-      <gearDisplay controller="hudianpao" pages="1"/>
+    <image id="n86_rbpg" name="n86" src="rbpg9w" fileName="component/clearing/images/hu.png" xy="1022,131" size="221,194" group="n70_dunj">
+      <gearDisplay controller="hudianpao" pages="1,2"/>
     </image>
-    <image id="n87_rbpg" name="n87" src="rbpga3" fileName="component/clearing/images/dianpao.png" xy="1112,227" size="170,170" group="n70_dunj">
+    <image id="n87_rbpg" name="n87" src="rbpga3" fileName="component/clearing/images/dianpao.png" xy="1057,508" size="157,97" group="n70_dunj">
       <gearDisplay controller="hudianpao" pages="2"/>
     </image>
     <group id="n70_dunj" name="n70" xy="-5,0" size="1334,1610" advanced="true">

wb_unity_pro_2/Library/CurrentLayout-default.dwlt

@@ -14,44 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -90.66667
-    y: 65.333336
-    width: 1009.3334
-    height: 813.3334
+    x: 944
+    y: 50
+    width: 876.6667
+    height: 860.6667
   m_ShowMode: 4
   m_Title: 
-  m_RootView: {fileID: 5}
+  m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 0
 --- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 201
-    height: 764
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 11}
-  m_Panes:
-  - {fileID: 12}
-  - {fileID: 11}
-  m_Selected: 1
-  m_LastSelected: 0
---- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67,17 +40,19 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 397
-    width: 809
-    height: 367
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 10}
+    y: 387
+    width: 877
+    height: 424
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 9}
   m_Panes:
+  - {fileID: 9}
   - {fileID: 10}
+  - {fileID: 11}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &4
+  m_LastSelected: 2
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -90,19 +65,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 3}
+  - {fileID: 8}
+  - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 201
+    x: 0
     y: 0
-    width: 809
-    height: 764
-  m_MinSize: {x: 202, y: 342}
-  m_MaxSize: {x: 4002, y: 8042}
+    width: 877
+    height: 811
+  m_MinSize: {x: 201, y: 342}
+  m_MaxSize: {x: 4001, y: 8042}
   vertical: 1
   controlID: 54
---- !u!114 &5
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -115,18 +90,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 5}
   - {fileID: 6}
   - {fileID: 7}
-  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1010
-    height: 814
+    width: 877
+    height: 861
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
---- !u!114 &6
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -143,12 +118,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1010
+    width: 877
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &7
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -161,19 +136,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
-  - {fileID: 4}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1010
-    height: 764
-  m_MinSize: {x: 403, y: 342}
-  m_MaxSize: {x: 8003, y: 8042}
+    width: 877
+    height: 811
+  m_MinSize: {x: 201, y: 342}
+  m_MaxSize: {x: 4001, y: 8042}
   vertical: 0
   controlID: 53
---- !u!114 &8
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -189,12 +163,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 794
-    width: 1010
+    y: 841
+    width: 877
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &9
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -211,17 +185,17 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 809
-    height: 397
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
+    width: 877
+    height: 387
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 14}
   - {fileID: 13}
+  - {fileID: 12}
   m_Selected: 1
-  m_LastSelected: 1
---- !u!114 &10
+  m_LastSelected: 0
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -242,12 +216,12 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 110.66667
-    y: 492.6667
-    width: 807
-    height: 346
+    x: 944
+    y: 467.33334
+    width: 876
+    height: 403
   m_ViewDataDictionary: {fileID: 0}
---- !u!114 &11
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -268,10 +242,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -90.66667
-    y: 95.333336
-    width: 200
-    height: 743
+    x: 0
+    y: 409
+    width: 1126
+    height: 353
   m_ViewDataDictionary: {fileID: 0}
   m_SceneHierarchy:
     m_TreeViewState:
@@ -302,7 +276,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: bfa95ada9bbee09488edd984532698fa
---- !u!114 &12
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -323,13 +297,13 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 19
-    width: 230
-    height: 743
+    x: 815.3334
+    y: 486.6667
+    width: 875
+    height: 353
   m_ViewDataDictionary: {fileID: 0}
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: GObj
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -340,19 +314,20 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders: []
+    m_Folders:
+    - Assets/Modules/FairyGUI/Scripts/UI
   m_ViewMode: 0
   m_StartGridSize: 64
   m_LastFolders: []
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\project\yunque\wb_unity_pro_2
+  m_LastProjectPath: D:\project\yunque\wb_unity_pro
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: f03b0000
     m_LastClickedID: 15344
-    m_ExpandedIDs: 00000000e82c0000ac360000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000
+    m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -377,10 +352,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000e82c0000ac360000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000
+    scrollPos: {x: 0, y: 1380}
+    m_SelectedIDs: ac310000
+    m_LastClickedID: 12716
+    m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -405,8 +380,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: ac310000
+    m_LastClickedInstanceID: 12716
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
@@ -436,7 +411,7 @@ MonoBehaviour:
     m_GridSize: 64
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 110
---- !u!114 &13
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -457,10 +432,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 110.66667
-    y: 95.333336
-    width: 807
-    height: 376
+    x: 944
+    y: 80
+    width: 876
+    height: 366
   m_ViewDataDictionary: {fileID: 0}
   m_SerializedViewNames: []
   m_SerializedViewValues: []
@@ -506,29 +481,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 807
-      height: 355
-    m_Scale: {x: 0.49305555, y: 0.49305555}
-    m_Translation: {x: 403.5, y: 177.5}
+      width: 876
+      height: 345
+    m_Scale: {x: 0.47916666, y: 0.47916666}
+    m_Translation: {x: 438, y: 172.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -818.3662
+      x: -914.087
       y: -360
-      width: 1636.7324
+      width: 1828.174
       height: 720
     m_MinimalGUI: 1
-  m_defaultScale: 0.49305555
-  m_LastWindowPixelSize: {x: 1210.5, y: 564}
+  m_defaultScale: 0.47916666
+  m_LastWindowPixelSize: {x: 1314, y: 549}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &14
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -550,9 +525,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 73
-    width: 1053
-    height: 523
+    y: 72.66667
+    width: 1186
+    height: 597
   m_ViewDataDictionary: {fileID: 0}
   m_ShowContextualTools: 0
   m_WindowGUID: f873ccafec97ed441a3bee2c6f85cf99
@@ -564,9 +539,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 10.679169, y: -8.514139, z: -10.744141}
+    m_Target: {x: 4.0907955, y: -1.5935472, z: -0.60360384}
     speed: 2
-    m_Value: {x: 10.679169, y: -8.514139, z: -10.744141}
+    m_Value: {x: 4.0907955, y: -1.5935472, z: -0.60360384}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -616,9 +591,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 13.498723
+    m_Target: 5.594339
     speed: 2
-    m_Value: 13.498723
+    m_Value: 5.594339
   m_Ortho:
     m_Target: 1
     speed: 2

wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json

@@ -1 +1 @@
-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-402548,-402544,-402536,-402532,-397936,-397932,-397920,-397840,-397822,-397804,-397800,-381856,-381660,-381642,-1184,-12],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

wb_unity_pro_2/Library/StateCache/SceneView/f873cc-mainStage.json

@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-2.2433347702026369,"y":-1.0502387285232545,"z":-13.009634971618653},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":5.452105522155762,"orthographic":true}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":4.090795516967773,"y":-1.5935472249984742,"z":-0.6036038398742676},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":5.594338893890381,"orthographic":true}

wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log

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