diff --git a/Assets/MyGame/Scripts/Net/APIManager.cs b/Assets/MyGame/Scripts/Net/APIManager.cs
index 9b5ee2785..93582063b 100644
--- a/Assets/MyGame/Scripts/Net/APIManager.cs
+++ b/Assets/MyGame/Scripts/Net/APIManager.cs
@@ -126,6 +126,16 @@ namespace Assets.MyGame.Scripts.Net
dic_API[APIType.User_ReadEmailMore] = "/api/User/ReadEmailMore";
dic_API[APIType.User_GetNoReadCount] = "/api/User/GetNoReadCount";
dic_API[APIType.User_GetEmailByPage] = "/api/User/GetEmailByPage";
+
+ // ---------------- Customer ----------------
+ dic_API[APIType.Customer_Start] = "/customerapi/Customer/start";
+ dic_API[APIType.Customer_Message] = "/customerapi/Customer/message";
+ dic_API[APIType.Customer_Messages] = "/customerapi/Customer/messages/{conversationId}";
+ dic_API[APIType.Customer_Conversations] = "/customerapi/Customer/conversations";
+ dic_API[APIType.Customer_End] = "/customerapi/Customer/end";
+ dic_API[APIType.Customer_Online] = "/customerapi/Customer/online";
+ dic_API[APIType.Customer_Status] = "/customerapi/Customer/status";
+ dic_API[APIType.Customer_ChatLog] = "/customerapi/Customer/chatlog/{conversationId}";
}
// ---------------- GET ----------------
diff --git a/Assets/MyGame/Scripts/Net/APIRequest/Objs/CustomerObjs.cs b/Assets/MyGame/Scripts/Net/APIRequest/Objs/CustomerObjs.cs
new file mode 100644
index 000000000..ce34c4e8b
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequest/Objs/CustomerObjs.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.MyGame.Scripts.Net.APIRequest.Objs
+{
+ ///
+ /// 发起会话请求对象(POST)
+ ///
+ public class StartConversationObj : RequestObjBase
+ {
+ ///
+ /// 用户ID
+ ///
+ public string userId;
+
+ ///
+ /// 用户名称
+ ///
+ public string userName;
+ }
+
+ ///
+ /// 发送消息请求对象(POST)
+ ///
+ public class SendMessageObj : RequestObjBase
+ {
+ ///
+ /// 会话ID
+ ///
+ public string conversationId;
+
+ ///
+ /// 发送者类型(1:用户 2:客服)
+ ///
+ public int senderType;
+
+ ///
+ /// 发送者ID
+ ///
+ public string senderId;
+
+ ///
+ /// 发送者名称
+ ///
+ public string senderName;
+
+ ///
+ /// 发送者头像
+ ///
+ public string senderAvatar;
+
+ ///
+ /// 内容类型(1:文字 2:图片)
+ ///
+ public int contentType;
+
+ ///
+ /// 消息内容(文字内容或图片URL)
+ ///
+ public string content;
+ }
+
+ ///
+ /// 结束会话请求对象(POST)
+ ///
+ public class EndConversationObj : RequestObjBase
+ {
+ ///
+ /// 会话ID
+ ///
+ public string conversationId;
+ }
+
+ ///
+ /// 更新客服状态请求对象(POST)
+ ///
+ public class UpdateCustomerStatusObj : RequestObjBase
+ {
+ ///
+ /// 客服用户ID
+ ///
+ public string userId;
+
+ ///
+ /// 状态(0:离线 1:在线)
+ ///
+ public int status;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIRequest/Objs/CustomerObjs.cs.meta b/Assets/MyGame/Scripts/Net/APIRequest/Objs/CustomerObjs.cs.meta
new file mode 100644
index 000000000..697a8b32e
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequest/Objs/CustomerObjs.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 068e63fe851e0524a98e54d4246c6541
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIRequest/Params/CustomerParams.cs b/Assets/MyGame/Scripts/Net/APIRequest/Params/CustomerParams.cs
new file mode 100644
index 000000000..3e4ce2f3b
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequest/Params/CustomerParams.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.MyGame.Scripts.Net.APIRequest.Params
+{
+ ///
+ /// 获取会话列表参数(GET)
+ ///
+ [Serializable]
+ public class GetConversationsParam : RequestParamBase
+ {
+ ///
+ /// 客服ID(可选)
+ ///
+ public string customerId;
+ }
+
+ ///
+ /// 获取消息列表参数(GET)
+ ///
+ [Serializable]
+ public class GetMessagesParam : RequestParamBase
+ {
+ ///
+ /// 会话ID
+ ///
+ public string conversationId;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIRequest/Params/CustomerParams.cs.meta b/Assets/MyGame/Scripts/Net/APIRequest/Params/CustomerParams.cs.meta
new file mode 100644
index 000000000..5df89c0ea
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequest/Params/CustomerParams.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2d88d23486653804688ff33c51c1dbb3
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs
new file mode 100644
index 000000000..371b0ccfa
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs
@@ -0,0 +1,125 @@
+using Assets.MyGame.Scripts.Net.API;
+using Assets.MyGame.Scripts.Net.APIRequest.Objs;
+using Assets.MyGame.Scripts.Net.APIRequest.Params;
+using Assets.MyGame.Scripts.Net.APIResponses.Customer_SubClass;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net
+{
+ public static partial class APIRequestList
+ {
+ #region Customer
+
+ ///
+ /// 发起会话(POST)
+ /// 参数:userId、userName
+ /// 返回:ConversationInfo(会话信息)
+ ///
+ public static void StartConversation(StartConversationObj req, Action callback)
+ {
+ APIManager.Response(APIType.Customer_Start, req, callback);
+ }
+
+ ///
+ /// 发送消息(POST)
+ /// 参数:conversationId、senderType、senderId、senderName、senderAvatar、contentType、content
+ /// 返回:CustomerMessageInfo(消息信息)
+ ///
+ public static void SendMessage(SendMessageObj req, Action callback)
+ {
+ APIManager.Response(APIType.Customer_Message, req, callback);
+ }
+
+ ///
+ /// 获取消息列表(GET)
+ /// 参数:conversationId
+ /// 返回:List(消息列表)
+ ///
+ public static void GetMessages(string conversationId, Action> callback)
+ {
+ APIManager.Response>(APIType.Customer_Messages, new GetMessagesParam
+ {
+ conversationId = conversationId
+ }, callback);
+ }
+
+ ///
+ /// 获取会话列表(GET)
+ /// 参数:customerId(可选)
+ /// 返回:List(会话列表)
+ ///
+ public static void GetConversations(Action> callback)
+ {
+ APIManager.Response>(APIType.Customer_Conversations, callback);
+ }
+
+ ///
+ /// 获取会话列表(GET,带客服ID筛选)
+ /// 参数:customerId
+ /// 返回:List(会话列表)
+ ///
+ public static void GetConversations(string customerId, Action> callback)
+ {
+ APIManager.Response>(APIType.Customer_Conversations, new GetConversationsParam
+ {
+ customerId = customerId
+ }, callback);
+ }
+
+ ///
+ /// 结束会话(POST)
+ /// 参数:conversationId
+ /// 返回:string(结果提示)
+ ///
+ public static void EndConversation(EndConversationObj req, Action callback)
+ {
+ APIManager.Response(APIType.Customer_End, req, callback);
+ }
+
+ ///
+ /// 获取在线客服列表(GET)
+ /// 返回:List(在线客服列表)
+ ///
+ public static void GetOnlineCustomers(Action> callback)
+ {
+ APIManager.Response>(APIType.Customer_Online, callback);
+ }
+
+ ///
+ /// 更新客服状态(POST)
+ /// 参数:userId、status(0:离线 1:在线)
+ /// 返回:string(结果提示)
+ ///
+ public static void UpdateCustomerStatus(UpdateCustomerStatusObj req, Action callback)
+ {
+ APIManager.Response(APIType.Customer_Status, req, callback);
+ }
+
+ ///
+ /// 获取聊天记录(GET)
+ /// 参数:conversationId
+ /// 返回:List(聊天记录列表)
+ ///
+ public static void GetChatLog(string conversationId, Action> callback)
+ {
+ APIManager.Response>(APIType.Customer_ChatLog, new GetMessagesParam
+ {
+ conversationId = conversationId
+ }, callback);
+ }
+
+ ///
+ /// 上传客服图片(POST,multipart/form-data)
+ /// 参数:file(文件二进制)
+ /// 返回:string(图片URL)
+ ///
+ public static void UploadCustomerImage(string filePath, Action callback)
+ {
+ APIManager.Response(APIType.ImageUpload_Upload, callback);
+ }
+
+ #endregion
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs.meta b/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs.meta
new file mode 100644
index 000000000..58a0826e4
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3e45b4c1d33670b4390ab6ebe49f39b6
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass.meta b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass.meta
new file mode 100644
index 000000000..cfc90e599
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22daf7fc589d73841957277b9fc22653
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs
new file mode 100644
index 000000000..c708bddf7
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs
@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.MyGame.Scripts.Net.APIResponses.Customer_SubClass
+{
+ ///
+ /// 会话信息
+ ///
+ [Serializable]
+ public class ConversationInfo
+ {
+ ///
+ /// 会话ID
+ ///
+ public string id;
+
+ ///
+ /// 用户ID
+ ///
+ public string userId;
+
+ ///
+ /// 用户昵称
+ ///
+ public string userName;
+
+ ///
+ /// 客服ID
+ ///
+ public string customerId;
+
+ ///
+ /// 客服昵称
+ ///
+ public string customerName;
+
+ ///
+ /// 会话状态
+ ///
+ public int status;
+
+ ///
+ /// 创建时间
+ ///
+ public string createTime;
+ }
+
+ ///
+ /// 消息信息
+ ///
+ [Serializable]
+ public class CustomerMessageInfo
+ {
+ ///
+ /// 会话ID
+ ///
+ public string conversationId;
+
+ ///
+ /// 发送者类型(1:用户 2:客服)
+ ///
+ public int senderType;
+
+ ///
+ /// 发送者ID
+ ///
+ public string senderId;
+
+ ///
+ /// 发送者昵称
+ ///
+ public string senderName;
+
+ ///
+ /// 发送者头像
+ ///
+ public string senderAvatar;
+
+ ///
+ /// 内容类型(1:文字 2:图片)
+ ///
+ public int contentType;
+
+ ///
+ /// 消息内容
+ ///
+ public string content;
+
+ ///
+ /// 创建时间
+ ///
+ public string createTime;
+ }
+
+ ///
+ /// 在线客服信息
+ ///
+ [Serializable]
+ public class CustomerOnlineInfo
+ {
+ ///
+ /// 客服用户ID
+ ///
+ public string userId;
+
+ ///
+ /// 客服名称
+ ///
+ public string userName;
+
+ ///
+ /// 客服头像
+ ///
+ public string avatar;
+
+ ///
+ /// 状态(0:离线 1:在线)
+ ///
+ public int status;
+ }
+
+ ///
+ /// 发起会话结果(WebSocket 回调)
+ ///
+ [Serializable]
+ public class StartConversationResult
+ {
+ ///
+ /// 是否成功
+ ///
+ public bool isOk;
+
+ ///
+ /// 提示信息
+ ///
+ public string msg;
+
+ ///
+ /// 会话信息
+ ///
+ public ConversationInfo conversation;
+ }
+
+ ///
+ /// 新会话通知(WebSocket 回调,客服端)
+ ///
+ [Serializable]
+ public class NewConversationNotice
+ {
+ ///
+ /// 会话ID
+ ///
+ public string conversationId;
+
+ ///
+ /// 客服ID
+ ///
+ public string customerId;
+
+ ///
+ /// 客服昵称
+ ///
+ public string customerName;
+
+ ///
+ /// 用户ID
+ ///
+ public string userId;
+
+ ///
+ /// 用户昵称
+ ///
+ public string userName;
+
+ ///
+ /// 会话状态
+ ///
+ public int status;
+
+ ///
+ /// 创建时间
+ ///
+ public string createTime;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs.meta
new file mode 100644
index 000000000..800689146
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cf22438ff743a8849bf5a34f266d8b89
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Enum/CustomerContentTypeEnum.cs b/Assets/MyGame/Scripts/Net/APIResponses/Enum/CustomerContentTypeEnum.cs
new file mode 100644
index 000000000..0ffe82a83
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/Enum/CustomerContentTypeEnum.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.MyGame.Scripts.Net.APIResponses.Enum
+{
+ ///
+ /// 客服消息内容类型枚举
+ ///
+ public enum CustomerContentTypeEnum
+ {
+ 文字=1,
+ 图片=2
+ }
+
+ ///
+ /// 客服发送者类型枚举
+ ///
+ public enum CustomerSenderTypeEnum
+ {
+ 用户=1,
+ 客服=2
+ }
+
+ ///
+ /// 客服状态枚举
+ ///
+ public enum CustomerStatusEnum
+ {
+ 离线=0,
+ 在线=1
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Enum/CustomerContentTypeEnum.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Enum/CustomerContentTypeEnum.cs.meta
new file mode 100644
index 000000000..dac029128
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/Enum/CustomerContentTypeEnum.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f77543a314d6007428bf28ab4236bcd3
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIType.cs b/Assets/MyGame/Scripts/Net/APIType.cs
index f38fce3bf..574505db2 100644
--- a/Assets/MyGame/Scripts/Net/APIType.cs
+++ b/Assets/MyGame/Scripts/Net/APIType.cs
@@ -270,5 +270,31 @@
/// 获取邮件列表(POST)
User_GetEmailByPage,
+
+
+ // ---------------- Customer ----------------
+ /// 发起会话(POST)
+ Customer_Start,
+
+ /// 发送消息(POST)
+ Customer_Message,
+
+ /// 获取消息列表(GET)
+ Customer_Messages,
+
+ /// 获取会话列表(GET)
+ Customer_Conversations,
+
+ /// 结束会话(POST)
+ Customer_End,
+
+ /// 获取在线客服列表(GET)
+ Customer_Online,
+
+ /// 更新客服状态(POST)
+ Customer_Status,
+
+ /// 获取聊天记录(GET)
+ Customer_ChatLog,
}
}
diff --git a/Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab
index 8a98f4c92..a999fa4cb 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab
+++ b/Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 8696377502892378563}
- component: {fileID: 4144480183065910834}
- component: {fileID: 2813318877703010542}
+ - component: {fileID: 908079249264142059}
m_Layer: 0
m_Name: "\u56FE\u5C42 1"
m_TagString: Untagged
@@ -85,6 +86,19 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!114 &908079249264142059
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 79262853638658620}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_AllowSwitchOff: 0
--- !u!1 &92832868174195349
GameObject:
m_ObjectHideFlags: 0
@@ -760,6 +774,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3500062041107021964
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7470759479811999074}
+ - component: {fileID: 7033250078061638705}
+ - component: {fileID: 3114912973091134536}
+ m_Layer: 0
+ m_Name: blue
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7470759479811999074
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3500062041107021964}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 199172646652219513}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 368, y: 82}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7033250078061638705
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3500062041107021964}
+ m_CullTransparentMesh: 1
+--- !u!114 &3114912973091134536
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3500062041107021964}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: d48b549febaa4194fb7f651e21ae8721, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &3649013945571076619
GameObject:
m_ObjectHideFlags: 0
@@ -1178,6 +1267,7 @@ GameObject:
- component: {fileID: 3127466166630518554}
- component: {fileID: 8053061106341327378}
- component: {fileID: 6442433320810787472}
+ - component: {fileID: 867493537761666578}
m_Layer: 0
m_Name: zsbk_tab_1_1
m_TagString: Untagged
@@ -1244,6 +1334,66 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!114 &867493537761666578
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5586405125720703616}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 6442433320810787472}
+ toggleTransition: 1
+ graphic: {fileID: 792993846390060201}
+ m_Group: {fileID: 908079249264142059}
+ onValueChanged:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 6517313830748326118}
+ m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+ m_MethodName: SetActive
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_IsOn: 0
--- !u!1 &5996832527140282313
GameObject:
m_ObjectHideFlags: 0
@@ -1254,14 +1404,13 @@ GameObject:
m_Component:
- component: {fileID: 199172646652219513}
- component: {fileID: 2285380866168456162}
- - component: {fileID: 1043766087510247383}
m_Layer: 0
m_Name: kefu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &199172646652219513
RectTransform:
m_ObjectHideFlags: 0
@@ -1274,6 +1423,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 7470759479811999074}
- {fileID: 3511234284133653061}
- {fileID: 751894749544625442}
- {fileID: 8912525273000014972}
@@ -1295,36 +1445,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5996832527140282313}
m_CullTransparentMesh: 1
---- !u!114 &1043766087510247383
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5996832527140282313}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: d48b549febaa4194fb7f651e21ae8721, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
--- !u!1 &6412846483119406888
GameObject:
m_ObjectHideFlags: 0
@@ -1654,6 +1774,7 @@ GameObject:
- component: {fileID: 7523322505792296813}
- component: {fileID: 2963548883020376645}
- component: {fileID: 5152449960383681170}
+ - component: {fileID: 8779605733858429284}
m_Layer: 0
m_Name: zsbk_tab_1
m_TagString: Untagged
@@ -1720,6 +1841,66 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8779605733858429284
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6769085429134515107}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 5152449960383681170}
+ toggleTransition: 1
+ graphic: {fileID: 5598271075492067753}
+ m_Group: {fileID: 908079249264142059}
+ onValueChanged:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 8877947529159609125}
+ m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+ m_MethodName: SetActive
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_IsOn: 0
--- !u!1 &6870553855238895950
GameObject:
m_ObjectHideFlags: 0
@@ -2357,10 +2538,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
btn_Close: {fileID: 0}
- toggle_DefaultQuestion: {fileID: 0}
- toggle_YouChangeIChange: {fileID: 0}
- toggle_OnlineService: {fileID: 0}
- toggle_Enter: {fileID: 0}
+ toggle_DefaultQuestion: {fileID: 8779605733858429284}
+ toggle_YouChangeIChange: {fileID: 867493537761666578}
+ toggle_OnlineService: {fileID: 3437016823728720811}
input_Text: {fileID: 0}
--- !u!222 &3166613308906463922
CanvasRenderer:
@@ -2411,6 +2591,7 @@ GameObject:
- component: {fileID: 6799211336476796995}
- component: {fileID: 6389808633010172007}
- component: {fileID: 6495909469996249096}
+ - component: {fileID: 3437016823728720811}
m_Layer: 0
m_Name: zsbk_tab_1_2
m_TagString: Untagged
@@ -2477,6 +2658,66 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3437016823728720811
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8429745142957546767}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 6495909469996249096}
+ toggleTransition: 1
+ graphic: {fileID: 1334048166197180193}
+ m_Group: {fileID: 908079249264142059}
+ onValueChanged:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 5996832527140282313}
+ m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+ m_MethodName: SetActive
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_IsOn: 0
--- !u!1 &8877947529159609125
GameObject:
m_ObjectHideFlags: 0
@@ -2494,7 +2735,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &2595741521076348832
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ServicePanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ServicePanel.cs
index ce68ebbf3..6f8933508 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ServicePanel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ServicePanel.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using Assets.MyGame.Scripts.Net;
+using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
@@ -10,10 +11,16 @@ public class UIHome_BY_ServicePanel : SubUIBase
public Toggle toggle_YouChangeIChange;
public Toggle toggle_OnlineService;
public TMP_InputField input_Text;
- // Start is called before the first frame update
- void Start()
+ public override void Awake()
{
-
+ base.Awake();
+ toggle_DefaultQuestion.onValueChanged.AddListener((a) =>
+ {
+ if (a)
+ {
+ //APIRequestList.GetOnlineCustomers
+ }
+ });
}
// Update is called once per frame
diff --git a/Assets/UIResources/Home/客服/图层 10.png.meta b/Assets/UIResources/Home/客服/图层 10.png.meta
index 8533e907a..2011517e1 100644
--- a/Assets/UIResources/Home/客服/图层 10.png.meta
+++ b/Assets/UIResources/Home/客服/图层 10.png.meta
@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteBorder: {x: 114, y: 35, z: 69, w: 19}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -126,7 +126,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
+ internalID: 1537655665
vertices: []
indices:
edges: []
diff --git a/Assets/UIResources/Home/客服/图层 8.png.meta b/Assets/UIResources/Home/客服/图层 8.png.meta
index 85299cef8..4ebe04c81 100644
--- a/Assets/UIResources/Home/客服/图层 8.png.meta
+++ b/Assets/UIResources/Home/客服/图层 8.png.meta
@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteBorder: {x: 79, y: 36, z: 164, w: 21}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -126,7 +126,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
+ internalID: 1537655665
vertices: []
indices:
edges: []
diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
index d2171d584..03d9ef745 100644
--- a/UserSettings/Layouts/default-2022.dwlt
+++ b/UserSettings/Layouts/default-2022.dwlt
@@ -14,14 +14,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
- x: 2607
- y: 555
- width: 480
- height: 561
+ x: 3284
+ y: 261
+ width: 640
+ height: 601
m_ShowMode: 0
- m_Title: "PSB \u2192 UGUI"
+ m_Title: Build Settings
m_RootView: {fileID: 5}
- m_MinSize: {x: 420, y: 381}
+ m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
m_Maximized: 0
--- !u!114 &2
@@ -38,14 +38,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
- x: 146
- y: 1052
- width: 1002
- height: 647
+ x: 3244
+ y: 685
+ width: 958
+ height: 599
m_ShowMode: 0
- m_Title: Addressables Report
+ m_Title: Package Manager
m_RootView: {fileID: 7}
- m_MinSize: {x: 280, y: 71}
+ m_MinSize: {x: 800, y: 271}
m_MaxSize: {x: 4000, y: 4021}
m_Maximized: 0
--- !u!114 &3
@@ -67,7 +67,7 @@ MonoBehaviour:
width: 1920
height: 997
m_ShowMode: 4
- m_Title: Hierarchy
+ m_Title: Project
m_RootView: {fileID: 8}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -82,17 +82,17 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: PsbToUGUIWindow
+ m_Name: BuildPlayerWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 480
- height: 561
- m_MinSize: {x: 420, y: 360}
- m_MaxSize: {x: 4000, y: 4000}
+ width: 640
+ height: 601
+ m_MinSize: {x: 640, y: 601}
+ m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 22}
m_Panes:
- {fileID: 22}
@@ -116,12 +116,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 480
- height: 561
- m_MinSize: {x: 420, y: 381}
+ width: 640
+ height: 601
+ m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
- controlID: 2891
+ controlID: 128267
draggingID: 0
--- !u!114 &6
MonoBehaviour:
@@ -133,17 +133,17 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: BuildReportWindow
+ m_Name: PackageManagerWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 1002
- height: 647
- m_MinSize: {x: 280, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
+ width: 958
+ height: 599
+ m_MinSize: {x: 800, y: 271}
+ m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 23}
m_Panes:
- {fileID: 23}
@@ -167,12 +167,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1002
- height: 647
- m_MinSize: {x: 280, y: 71}
+ width: 958
+ height: 599
+ m_MinSize: {x: 800, y: 271}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
- controlID: 15
+ controlID: 125408
draggingID: 0
--- !u!114 &8
MonoBehaviour:
@@ -269,7 +269,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 100}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
- controlID: 24
+ controlID: 77
draggingID: 0
--- !u!114 &12
MonoBehaviour:
@@ -290,12 +290,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1415
+ width: 1351
height: 947
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
- controlID: 25
+ controlID: 78
draggingID: 0
--- !u!114 &13
MonoBehaviour:
@@ -317,12 +317,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1415
- height: 569
+ width: 1351
+ height: 454
m_MinSize: {x: 300, y: 50}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
- controlID: 26
+ controlID: 79
draggingID: 0
--- !u!114 &14
MonoBehaviour:
@@ -341,10 +341,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 435
- height: 569
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
+ width: 408
+ height: 454
+ m_MinSize: {x: 201, y: 221}
+ m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 24}
m_Panes:
- {fileID: 24}
@@ -365,12 +365,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 435
+ x: 408
y: 0
- width: 292
- height: 569
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
+ width: 442
+ height: 454
+ m_MinSize: {x: 202, y: 221}
+ m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 26}
m_Panes:
- {fileID: 25}
@@ -392,10 +392,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 727
+ x: 850
y: 0
- width: 688
- height: 569
+ width: 501
+ height: 454
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 35}
@@ -422,13 +422,13 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 569
- width: 1415
- height: 378
+ y: 454
+ width: 1351
+ height: 493
m_MinSize: {x: 300, y: 50}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
- controlID: 183
+ controlID: 200
draggingID: 0
--- !u!114 &18
MonoBehaviour:
@@ -447,8 +447,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 609
- height: 378
+ width: 522
+ height: 493
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 27}
@@ -474,10 +474,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 609
+ x: 522
y: 0
- width: 428
- height: 378
+ width: 493
+ height: 493
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_ActualView: {fileID: 31}
@@ -500,10 +500,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1037
+ x: 1015
y: 0
- width: 378
- height: 378
+ width: 336
+ height: 493
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_ActualView: {fileID: 32}
@@ -526,9 +526,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1415
+ x: 1351
y: 0
- width: 505
+ width: 569
height: 947
m_MinSize: {x: 276, y: 121}
m_MaxSize: {x: 4001, y: 4021}
@@ -547,21 +547,21 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 6da7122f5a2be36409e67396174068c0, type: 3}
+ m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
- m_MinSize: {x: 420, y: 360}
+ m_MinSize: {x: 640, y: 580}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
- m_Text: "PSB \u2192 UGUI"
+ m_Text: Build Settings
m_Image: {fileID: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 2607
- y: 555
- width: 480
- height: 540
+ x: 3284
+ y: 261
+ width: 640
+ height: 580
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -572,6 +572,28 @@ MonoBehaviour:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
+ m_TreeViewState:
+ scrollPos: {x: 0, y: 0}
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs:
+ m_RenameOverlay:
+ m_UserAcceptedRename: 0
+ m_Name:
+ m_OriginalName:
+ m_EditFieldRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 0
+ height: 0
+ m_UserData: 0
+ m_IsWaitingForDelay: 0
+ m_IsRenaming: 0
+ m_OriginalEventType: 11
+ m_IsRenamingFilename: 0
+ m_ClientGUIView: {fileID: 0}
+ m_SearchString:
--- !u!114 &23
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -581,21 +603,22 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: c968f079e79719d42b0dd2761ddd8e2c, type: 3}
+ m_Script: {fileID: 13953, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
- m_MinSize: {x: 280, y: 50}
+ m_MinSize: {x: 800, y: 250}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
- m_Text: Addressables Report
- m_Image: {fileID: 0}
+ m_Text: Package Manager
+ m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000,
+ type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 146
- y: 1052
- width: 1002
- height: 626
+ x: 3244
+ y: 685
+ width: 958
+ height: 578
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -606,16 +629,6 @@ MonoBehaviour:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
- m_WindowTreeAsset: {fileID: 9197481963319205126, guid: 9aa68e6fb55252f4b8434690fab30a8a,
- type: 3}
- m_ReportListItemTreeAsset: {fileID: 9197481963319205126, guid: 79fbad0cce3fe424681d87c3d2642165,
- type: 3}
- m_DetailsPanelSummaryNavigableItemTreeAsset: {fileID: 9197481963319205126, guid: b22c8ae15806ae44785d1d2528127632,
- type: 3}
- m_DetailsPanelSummaryNavigableBundleTreeAsset: {fileID: 9197481963319205126, guid: 82c7396e127bdc14e8983693357610a3,
- type: 3}
- m_ActiveContentViewType: 0
- m_ActivePotentialIssuesViewType: 0
--- !u!114 &24
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -639,8 +652,8 @@ MonoBehaviour:
serializedVersion: 2
x: 2560
y: 73
- width: 434
- height: 548
+ width: 407
+ height: 433
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -653,24 +666,24 @@ MonoBehaviour:
m_OverlaysVisible: 1
m_SceneHierarchy:
m_TreeViewState:
- scrollPos: {x: 0, y: 1521}
- m_SelectedIDs: 00d6feff
- m_LastClickedID: -76288
- m_ExpandedIDs: 184dfeff6c53feff6ed1feff24d5feff9cd5feffbad5feffb4d6feffd2d6feffc2d7feff48acffff52acffffa2acffffb6acffff6eaeffff76b0ffffbab2ffff0afbffff64c1000080c10000
+ scrollPos: {x: 0, y: 0}
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs: 706dfbffc46efbffec72fbfff072fbfff872fbff328afbff10c4fbffbe2afcff109ffcff7e9ffcff889ffcff929ffcffd89ffcffe29ffcffec9ffcff0aa0fcff14a0fcff1ea0fcff28a0fcff32a0fcff4e8efeff708efeff808efeff928efeff148ffeff228ffeffb0fffeffd2fffeffd6fffeffe6fffefff0fffeff9800ffffa800ffff2a01ffff9e2bfffff032ffffea93ffff1eb7ffff48b7ffff86bcffff9ebcffffb2bcffff0afbfffff4ffffff92be000094c1000036c20000e0c30000
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name: PSB_UI
- m_OriginalName: PSB_UI
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: -75838
+ m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 0
+ m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 14}
m_SearchString:
@@ -842,10 +855,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 2995
+ x: 2968
y: 73
- width: 290
- height: 548
+ width: 440
+ height: 433
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -873,9 +886,9 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
- snapOffset: {x: -141, y: -225}
+ snapOffset: {x: -299, y: 25}
snapOffsetDelta: {x: 0, y: 0}
- snapCorner: 3
+ snapCorner: 1
id: unity-grid-and-snap-toolbar
index: 1
layout: 1
@@ -1191,9 +1204,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 771.24493, y: 668.0261, z: -2.7369018}
+ m_Target: {x: 242.46716, y: 227.54718, z: -18.082254}
speed: 2
- m_Value: {x: 774.68463, y: 680.2215, z: -2.8880396}
+ m_Value: {x: 242.46716, y: 227.54718, z: -18.082254}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -1243,9 +1256,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
- m_Target: 320.75104
+ m_Target: 2006.5283
speed: 2
- m_Value: 335.86496
+ m_Value: 2006.5283
m_Ortho:
m_Target: 1
speed: 2
@@ -1292,9 +1305,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 2560
- y: 642
- width: 608
- height: 357
+ y: 527
+ width: 521
+ height: 472
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -1362,9 +1375,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 2560
- y: 491
- width: 641
- height: 508
+ y: 527
+ width: 521
+ height: 472
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -1385,8 +1398,7 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SkipHidden: 0
m_SearchArea: 1
- m_Folders:
- - Assets
+ m_Folders: []
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@@ -1403,7 +1415,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 523}
m_SelectedIDs: 30b90200
m_LastClickedID: 178480
- m_ExpandedIDs: 00000000b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100822001008420010086200100882001008a2001008c2001008e20010090200100922001009420010096200100982001009a2001009c2001009e200100a0200100a2200100a4200100a6200100a8200100aa200100ac200100ae200100b0200100b2200100b4200100b6200100b8200100ba200100bc200100be200100
+ m_ExpandedIDs: 00000000761f0100781f01007a1f01007c1f01007e1f0100801f0100821f0100841f0100861f0100881f01008a1f01008c1f01008e1f0100901f0100921f0100941f0100961f0100981f01009a1f01009c1f01009e1f0100a01f0100a21f0100a41f0100a61f0100a81f0100aa1f0100ac1f0100ae1f0100b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e200100802001008220010084200100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1428,10 +1440,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
- scrollPos: {x: 0, y: 1702}
- m_SelectedIDs: 86170100
- m_LastClickedID: 71558
- m_ExpandedIDs: 00000000b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100822001008420010086200100882001008a2001008c2001008e20010090200100922001009420010096200100982001009a2001009c2001009e200100a0200100a2200100a4200100a6200100a8200100aa200100ac200100ae200100b0200100b2200100b4200100b6200100b8200100ba200100bc200100be200100
+ scrollPos: {x: 0, y: 1124}
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs: ffffffff00000000761f0100781f01007a1f01007c1f01007e1f0100801f0100821f0100841f0100861f0100881f01008a1f01008c1f01008e1f0100901f0100921f0100941f0100961f0100981f01009a1f01009c1f01009e1f0100a01f0100a21f0100a41f0100a61f0100a81f0100aa1f0100ac1f0100ae1f0100b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e200100102001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100842001002421010034210100082a0100c2e5040036e70400
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1456,8 +1468,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs: 86170100
- m_LastClickedInstanceID: 71558
+ m_SelectedInstanceIDs:
+ m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000467d0000c67e00009874000024c5fdff647400009274000016a500003aa500002ed3020028d3020078e003007e76000088760000247a0000e67e0000487b0000
m_RenameOverlay:
@@ -1691,10 +1703,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 3169
- y: 642
- width: 426
- height: 357
+ x: 3082
+ y: 527
+ width: 491
+ height: 472
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -1716,7 +1728,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/UIResources/Home
+ - Assets/MyGame/aa/UI/Home
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@@ -1724,30 +1736,30 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 96
m_LastFolders:
- - "Assets/UIResources/Home/\u5546\u57CEui"
+ - Assets/MyGame/aa/UI/Home
m_LastFoldersGridSize: 96
m_LastProjectPath: E:\UnityProject\5_24BuYu
m_LockTracker:
m_IsLocked: 1
m_FolderTreeState:
- scrollPos: {x: 0, y: 1380}
- m_SelectedIDs: 46200100
- m_LastClickedID: 73798
- m_ExpandedIDs: 00000000b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100822001008420010086200100882001008a2001008c2001008e20010090200100922001009420010096200100982001009a2001009c2001009e200100a0200100a2200100a4200100a6200100a8200100aa200100ac200100ae200100b0200100b2200100b4200100b6200100b8200100ba200100bc200100be20010000ca9a3bffffff7f
+ scrollPos: {x: 0, y: 640}
+ m_SelectedIDs: 841f0100
+ m_LastClickedID: 73604
+ m_ExpandedIDs: 00000000761f0100781f01007a1f01007c1f01007e1f0100801f0100821f0100841f0100861f0100881f01008a1f01008c1f01008e1f0100901f0100921f0100941f0100961f0100981f01009a1f01009c1f01009e1f0100a01f0100a21f0100a41f0100a61f0100a81f0100aa1f0100ac1f0100ae1f0100b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e200100802001008220010084200100082101003421010000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
+ m_Name: Fonts & Materials
+ m_OriginalName: Fonts & Materials
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: 0
+ m_UserData: 76294
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 11
+ m_OriginalEventType: 0
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 19}
m_SearchString:
@@ -1761,7 +1773,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100822001008420010086200100882001008a2001008c2001008e20010090200100922001009420010096200100982001009a2001009c2001009e200100a0200100a2200100a4200100a6200100a8200100aa200100ac200100ae200100b0200100b2200100b4200100b6200100b8200100ba200100bc200100be200100
+ m_ExpandedIDs: 00000000761f0100781f01007a1f01007c1f01007e1f0100801f0100821f0100841f0100861f0100881f01008a1f01008c1f01008e1f0100901f0100921f0100941f0100961f0100981f01009a1f01009c1f01009e1f0100a01f0100a21f0100a41f0100a61f0100a81f0100aa1f0100ac1f0100ae1f0100b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e200100802001008220010084200100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1788,7 +1800,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
- m_HadKeyboardFocusLastEvent: 1
+ m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: 4675000052970000469700008696000074960000987e0000c8630100c4ec0000e2ef0000dcef0000beef000098da00009cda000020a30000c6a200000eab000036c10000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -1813,7 +1825,7 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
- m_ScrollPosition: {x: 0, y: 1140}
+ m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 96
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 216
@@ -1838,10 +1850,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 3597
- y: 642
- width: 376
- height: 357
+ x: 3575
+ y: 527
+ width: 334
+ height: 472
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -1863,7 +1875,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/UIResources/Home
+ - Assets/MyGame/aa/UI/Home/Sub
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@@ -1871,16 +1883,16 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 96
m_LastFolders:
- - Assets/UIResources/Home
+ - Assets/MyGame/aa/UI/Home/Sub
m_LastFoldersGridSize: 96
m_LastProjectPath: E:\UnityProject\5_24BuYu
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
- scrollPos: {x: 0, y: 3119}
- m_SelectedIDs: 46200100
- m_LastClickedID: 73798
- m_ExpandedIDs: 00000000b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100822001008420010086200100882001008a2001008c2001008e20010090200100922001009420010096200100982001009a2001009c2001009e200100a0200100a2200100a4200100a6200100a8200100aa200100ac200100ae200100b0200100b2200100b4200100b6200100b8200100ba200100bc200100be200100062101003e29010000ca9a3bffffff7f
+ scrollPos: {x: 0, y: 767}
+ m_SelectedIDs: 02210100
+ m_LastClickedID: 73986
+ m_ExpandedIDs: 00000000761f0100781f01007a1f01007c1f01007e1f0100801f0100821f0100841f0100861f0100881f01008a1f01008c1f01008e1f0100901f0100921f0100941f0100961f0100981f01009a1f01009c1f01009e1f0100a01f0100a21f0100a41f0100a61f0100a81f0100aa1f0100ac1f0100ae1f0100b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e200100602001006220010064200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100822001008420010002210100242101002c2101003421010000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1908,7 +1920,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e20010080200100822001008420010086200100882001008a2001008c2001008e20010090200100922001009420010096200100982001009a2001009c2001009e200100a0200100a2200100a4200100a6200100a8200100aa200100ac200100ae200100b0200100b2200100b4200100b6200100b8200100ba200100bc200100be200100
+ m_ExpandedIDs: 00000000761f0100781f01007a1f01007c1f01007e1f0100801f0100821f0100841f0100861f0100881f01008a1f01008c1f01008e1f0100901f0100921f0100941f0100961f0100981f01009a1f01009c1f01009e1f0100a01f0100a21f0100a41f0100a61f0100a81f0100aa1f0100ac1f0100ae1f0100b01f0100b21f0100b41f0100b61f0100b81f0100ba1f0100bc1f0100be1f0100c01f0100c21f0100c41f0100c61f0100c81f0100ca1f0100cc1f0100ce1f0100d01f0100d21f0100d41f0100d61f0100d81f0100da1f0100dc1f0100de1f0100e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100f01f0100f21f0100f41f0100f61f0100f81f0100fa1f0100fc1f0100fe1f010000200100022001000420010006200100082001000a2001000c2001000e20010010200100122001001420010016200100182001001a2001001c2001001e20010020200100222001002420010026200100282001002a2001002c2001002e20010030200100322001003420010036200100382001003a2001003c2001003e20010040200100422001004420010046200100482001004a2001004c2001004e20010050200100522001005420010056200100582001005a2001005c2001005e20010060200100622001006420010066200100682001006a2001006c2001006e20010070200100722001007420010076200100782001007a2001007c2001007e200100802001008220010084200100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1936,7 +1948,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
- m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a210100
+ m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d00000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1960,10 +1972,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
- m_ScrollPosition: {x: 0, y: 2543}
+ m_ScrollPosition: {x: 0, y: 3485.5}
m_GridSize: 96
m_SkipHiddenPackages: 0
- m_DirectoriesAreaWidth: 211
+ m_DirectoriesAreaWidth: 133
--- !u!114 &33
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -1985,9 +1997,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 3967
+ x: 3911
y: 73
- width: 512
+ width: 568
height: 926
m_SerializedDataModeController:
m_DataMode: 0
@@ -1999,19 +2011,18 @@ MonoBehaviour:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
- m_ObjectsLockedBeforeSerialization:
- - {fileID: 11400000, guid: afe4850fa6ef7284b8d8cd1e107c60b0, type: 2}
+ m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
- m_CachedPref: 446
+ m_CachedPref: 368
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
- m_LastInspectedObjectInstanceID: 46588
+ m_LastInspectedObjectInstanceID: 50144
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker:
- m_IsLocked: 1
+ m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
--- !u!114 &34
MonoBehaviour:
@@ -2034,9 +2045,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 3975
+ x: 3911
y: 73
- width: 504
+ width: 568
height: 926
m_SerializedDataModeController:
m_DataMode: 0
@@ -2082,10 +2093,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 3287
+ x: 3410
y: 73
- width: 686
- height: 548
+ width: 499
+ height: 433
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -2099,7 +2110,7 @@ MonoBehaviour:
m_SerializedViewNames:
- UnityEditor.DeviceSimulation.SimulatorWindow
m_SerializedViewValues:
- - E:\UnityProject\5_24BuYu\Library\PlayModeViewStates\3a4722cd9c5331447bd29abffc2168ad
+ - E:\UnityProject\5_24BuYu\Library\PlayModeViewStates\de2d86dcef8c8db4da23f8fa968d70c6
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
@@ -2140,23 +2151,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 686
- height: 527
- m_Scale: {x: 0.4224138, y: 0.4224138}
- m_Translation: {x: 343, y: 263.5}
+ width: 499
+ height: 412
+ m_Scale: {x: 0.307266, y: 0.307266}
+ m_Translation: {x: 249.50002, y: 206}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -812
- y: -623.7959
- width: 1624
- height: 1247.5918
+ x: -812.00006
+ y: -670.4289
+ width: 1624.0001
+ height: 1340.8578
m_MinimalGUI: 1
- m_defaultScale: 0.4224138
- m_LastWindowPixelSize: {x: 686, y: 548}
+ m_defaultScale: 0.307266
+ m_LastWindowPixelSize: {x: 499, y: 433}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000001000000000000