aa

Assets/Lua/UI/UIRuneShop/UIRuneShopBTView.lua

@@ -1092,12 +1092,14 @@ end
 
 function UIRuneShopBTView:SetHideLB()
 	if IShServer() then
-		self.controller.shopType = Enum.RuneShopType.Gifts
-		self.controller.shopSubType = Enum.RuneShopSubType.ROCoin
+		self.controller:SetData({Enum.RuneShopType.Gifts,Enum.RuneShopSubType.ROCoin})
+		self.controller:InitData()
 		self.privilegeCardToggle:SetActive(false)
 		self.weekToggle:SetActive(false)
 		self.passportToggle:SetActive(false)
 		self.limitedToggle:SetActive(false)
+		self.weekBtn:SetActive(false)
+		self.monthBtn:SetActive(false)
 	end
 end
 return UIRuneShopBTView

UserSettings/Layouts/default-2021.dwlt

@@ -43,7 +43,7 @@ MonoBehaviour:
     width: 1304
     height: 903
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Hierarchy
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -97,7 +97,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 43
+  controlID: 61
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 35
+  controlID: 34
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -218,7 +218,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 72
+  controlID: 35
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -243,7 +243,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 17
+  controlID: 36
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -263,8 +263,8 @@ MonoBehaviour:
     y: 0
     width: 464
     height: 541
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -316,8 +316,8 @@ MonoBehaviour:
     y: 541
     width: 926
     height: 312
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 16}
@@ -343,8 +343,8 @@ MonoBehaviour:
     y: 0
     width: 378
     height: 853
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -475,7 +475,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: UIMain
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -485,23 +485,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Editor/CsvToLua
+    - Assets/Editor/AssetBundle
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: UIMain
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Editor/CsvToLua
+  - Assets/Editor/AssetBundle
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\Project\Unity\bt_client_2022_S
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 53}
-    m_SelectedIDs: 827c0300
-    m_LastClickedID: 228482
-    m_ExpandedIDs: 00000000e2b20200e4b20200e6b20200e8b20200eab20200ecb20200eeb20200787b030000ca9a3b
+    scrollPos: {x: 0, y: 180}
+    m_SelectedIDs: 18880100
+    m_LastClickedID: 100376
+    m_ExpandedIDs: 00000000245f0000265f0000285f00002a5f00002c5f0000305f0000d2870100eea1010000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -529,7 +529,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000e2b20200e4b20200e6b20200e8b20200eab20200ecb20200eeb20200
+    m_ExpandedIDs: 00000000245f0000265f0000285f00002a5f00002c5f00002e5f0000305f0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -560,20 +560,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: c62300002cdf01008cb00c0000cf0c0076280d007e660c0098660c0060940c0008a10c00e6950c008ec90c00c2f8010000000000084604006c410400a2010500b6610000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: UIPrivilegeCardTips
+      m_OriginalName: UIPrivilegeCardTips
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 128094
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 13}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -620,7 +620,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: bab0fbffe61afefff4ffffff9cb20200
+      m_ExpandedIDs: 4c7ad1ffd47bd1ffd27fd1ffdc7fd1ffe67fd1ff7880d1ffdca8d1ff5808d5ff5c08d5ff6008d5ffe808d5ffd21bd5ffec1bd5fff61bd5ff041cd5ffc837d5ffcc37d5ffd037d5ff5838d5ff424bd5ff5c4bd5ff664bd5ff744bd5ff6654d5ff6a54d5ff6e54d5fff654d5ffe067d5fffa67d5ff0468d5ff1268d5ffa663d7ff6e65d7ff7469d7ff7e69d7ff8869d7ff7e92d7ff3456dbff3c56dbff445adbff5e5adbff685adbff785adbff4a0ae3ff8234e3ff9a34e3ffb634e3ffb035e3ffca35e3ffd435e3ffe235e3ffd605e4ff3c9cfaff489cfaff4e9cfaff5c9cfaffbc52fbffeef8fcfffaf8fcff00f9fcff0ef9fcffe4fafffff4ffffffde5e0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -937,9 +937,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -1.1684126, y: 1.6461904, z: 1.2718133}
+    m_Target: {x: -1.3395422, y: 2.4246774, z: 1.0223503}
     speed: 2
-    m_Value: {x: -1.1684126, y: 1.6461904, z: 1.2718133}
+    m_Value: {x: -1.3395422, y: 2.4246774, z: 1.0223503}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -990,9 +990,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 4.3113775
+    m_Target: 2.0889614
     speed: 2
-    m_Value: 4.3113775
+    m_Value: 2.0889614
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1050,6 +1050,7 @@ MonoBehaviour:
   m_ViewTransforms:
     m_KeySerializationHelper:
     - {fileID: 1107033589464668458, guid: 72fdd5e869d92304db46d9c4a9611197, type: 2}
+    - {fileID: 1107055253092224398, guid: ec099100a25a6e94facf1732e56ceb4c, type: 2}
     m_ValueSerializationHelper:
     - e00: 1
       e01: 0
@@ -1067,11 +1068,27 @@ MonoBehaviour:
       e31: 0
       e32: 0
       e33: 1
+    - e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
   m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: 72fdd5e869d92304db46d9c4a9611197,
+  m_AnimatorController: {fileID: 9100000, guid: ec099100a25a6e94facf1732e56ceb4c,
     type: 2}
   m_BreadCrumbs:
-  - m_Target: {fileID: 1107033589464668458, guid: 72fdd5e869d92304db46d9c4a9611197,
+  - m_Target: {fileID: 1107055253092224398, guid: ec099100a25a6e94facf1732e56ceb4c,
       type: 2}
     m_ScrollPosition: {x: 0, y: 0}
   stateMachineGraph: {fileID: 0}