From 47740fc859b832483c466152f413f836f78ecd58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com>
Date: Wed, 8 Jul 2026 20:49:22 +0800
Subject: [PATCH] 1
---
.../AssetGroups/Fish_FLZY.asset | 6 -
.../AssetGroups/Fish_YYSC.asset | 6 -
Assets/MyGame/Scenes/UIScene.unity | 137 +--
Assets/MyGame/Scripts/Net/APIManager.cs | 2 +
.../Scripts/Net/APIRequestList_Customer.cs | 10 +
.../MyGame/Scripts/Net/APIRequestList_Hall.cs | 9 +
.../Customer_SubClass/ConversationInfo.cs | 14 +
.../Scripts/Net/APIResponses/GameConfig.cs | 5 +
.../GameConfig_SubClass/BattleOrderConfig.cs | 6 +-
.../GameConfig_SubClass/FishRoomConfig.cs | 19 +
.../FishRoomConfig.cs.meta | 11 +
.../Scripts/Net/APIResponses/HallResponses.cs | 13 +-
Assets/MyGame/Scripts/Net/APIType.cs | 6 +
.../Scripts/Net/WebResponses/BotConfig.cs | 2 +-
Assets/MyGame/Scripts/Net/WebSocketManager.cs | 6 +-
Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab | 2 +-
.../aa/UI/Game/ChineseChess/1District.prefab | 1066 +----------------
.../UI/Game/ChineseChess/2.5SelectCoin.prefab | 14 +-
.../ChineseChess/ChineseChessMainPanel.cs | 4 +-
.../ChineseChess/UIChineseChessDistrict.cs | 29 +-
.../ChineseChess/UIChineseChessSetCoin.cs | 22 +-
Assets/MyGame/aa/UI/Home/MainPanel.prefab | 72 +-
Assets/MyGame/aa/UI/Home/Sub/SafeBox.prefab | 2 +-
.../aa/UI/Home/Sub/SelectRoomPanel.prefab | 31 +-
.../Sub/UIHome_BY_SelectRoomLevelPanel.cs | 14 +
.../aa/UI/Home/Sub/UIHome_BY_ServicePanel.cs | 158 ++-
Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab | 100 +-
.../aa/UI/Home/Sub/ZhanLing/LevelGiftitem.cs | 46 +-
.../MyGame/aa/UI/Home/Sub/ZhanLing_Panel.cs | 105 +-
.../商城ui => 刮刮卡}/icon_box_zuanshi 5.png | Bin
.../icon_box_zuanshi 5.png.meta | 0
31 files changed, 475 insertions(+), 1442 deletions(-)
create mode 100644 Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs
create mode 100644 Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs.meta
rename Assets/UIResources/{Home/商城ui => 刮刮卡}/icon_box_zuanshi 5.png (100%)
rename Assets/UIResources/{Home/商城ui => 刮刮卡}/icon_box_zuanshi 5.png.meta (100%)
diff --git a/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset b/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset
index b680dec86..c86b48f75 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset
@@ -269,12 +269,6 @@ MonoBehaviour:
- FLZY
- FishPrefab
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 5d67245a73fb5024fb90af6f339863d6
- m_Address: Assets/Art/FengLei
- m_ReadOnly: 0
- m_SerializedLabels:
- - Resources
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 628d6c681bbf87f449e839c4e81003f6
m_Address: Assets/Art/FengLei/bundles/by_fish_base/bundles/prefab/fishbase@/25.prefab
m_ReadOnly: 0
diff --git a/Assets/AddressableAssetsData/AssetGroups/Fish_YYSC.asset b/Assets/AddressableAssetsData/AssetGroups/Fish_YYSC.asset
index 14b957485..8b22a41cc 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Fish_YYSC.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Fish_YYSC.asset
@@ -108,12 +108,6 @@ MonoBehaviour:
- FishPrefab
- YYSC
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 288c0597e267bbb4db2b0c2565fa27b9
- m_Address: Assets/Art/YYSC
- m_ReadOnly: 0
- m_SerializedLabels:
- - Resources
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2ace7fe0ce83e334e879af741732e751
m_Address: Assets/MyGame/aa/Game/YYSC/Monster/renzheshenguijiangshi.prefab
m_ReadOnly: 0
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index 19bf4d432..d1d75b42e 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -6765,7 +6765,6 @@ RectTransform:
- {fileID: 1819495571}
- {fileID: 3182697403238626235}
- {fileID: 1137879511}
- - {fileID: 1281320455}
- {fileID: 4727940489469859465}
- {fileID: 4683725053833302880}
- {fileID: 1804551267}
@@ -6868,7 +6867,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1137879511
RectTransform:
m_ObjectHideFlags: 0
@@ -8281,140 +8280,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1277176622}
m_CullTransparentMesh: 1
---- !u!1001 &1281320454
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1096182889}
- m_Modifications:
- - target: {fileID: 3239626154716872945, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4870890971057883554, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5615636425683840664, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_Name
- value: TurretPanel
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: aab7adfb6126f094f8860d975314558b, type: 3}
---- !u!224 &1281320455 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b,
- type: 3}
- m_PrefabInstance: {fileID: 1281320454}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1312826143
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/Scripts/Net/APIManager.cs b/Assets/MyGame/Scripts/Net/APIManager.cs
index 433f3f870..12b4274b0 100644
--- a/Assets/MyGame/Scripts/Net/APIManager.cs
+++ b/Assets/MyGame/Scripts/Net/APIManager.cs
@@ -161,6 +161,7 @@ namespace Assets.MyGame.Scripts.Net
// ---------------- Rank ----------------
dic_API[APIType.Rank_GetUserList] = "/api/User/GetUserList";
dic_API[APIType.Hall_GetRanking] = "/api/Hall/GetRanking";
+ dic_API[APIType.Hall_GetChessRoomPartitionCount] = "/api/Hall/GetChessRoomPartitionCount";
// ---------------- Customer ----------------
dic_API[APIType.Customer_Start] = "/customerapi/Customer/start";
@@ -171,6 +172,7 @@ namespace Assets.MyGame.Scripts.Net
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}";
+ dic_API[APIType.Customer_MyConversations] = "/customerapi/Customer/my-conversations";
}
// ---------------- GET ----------------
diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs
index 371b0ccfa..a6a83161d 100644
--- a/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs
+++ b/Assets/MyGame/Scripts/Net/APIRequestList_Customer.cs
@@ -110,6 +110,16 @@ namespace Assets.MyGame.Scripts.Net
}, callback);
}
+ ///
+ /// 获取我的会话列表（含消息历史）
+ /// GET /customerapi/Customer/my-conversations
+ /// 返回：List
+ ///
+ public static void GetMyConversations(Action> callback)
+ {
+ APIManager.Response>(APIType.Customer_MyConversations, callback);
+ }
+
///
/// 上传客服图片（POST，multipart/form-data）
/// 参数：file（文件二进制）
diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs
index 1477463ec..f4f60e06f 100644
--- a/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs
+++ b/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs
@@ -287,6 +287,15 @@ namespace Assets.MyGame.Scripts.Net
APIManager.Response(APIType.Hall_GetRanking, req, callback);
}
+ ///
+ /// 获取象棋分区总数（GET，无参）
+ /// 返回：int
+ ///
+ public static void GetChessRoomPartitionCount(Action callback)
+ {
+ APIManager.Response(APIType.Hall_GetChessRoomPartitionCount, callback);
+ }
+
#endregion
}
}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs
index c708bddf7..04ecbf930 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/Customer_SubClass/ConversationInfo.cs
@@ -185,4 +185,18 @@ namespace Assets.MyGame.Scripts.Net.APIResponses.Customer_SubClass
///
public string createTime;
}
+
+ ///
+ /// 我的会话（含消息列表）
+ /// GET /customerapi/Customer/my-conversations
+ ///
+ [Serializable]
+ public class MyConversationInfo
+ {
+ public string id;
+ public string userId;
+ public string customerId;
+ public int status;
+ public List messages;
+ }
}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs
index 7ec07f3d0..d59b9ebca 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs
@@ -80,5 +80,10 @@ namespace Assets.MyGame.Scripts.Net.API
/// 象棋配置
///
public ChessConfig chessConfig;
+
+ ///
+ /// 捕鱼房间配置
+ ///
+ public FishRoomConfig fishRoomConfig;
}
}
\ No newline at end of file
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs
index 72e1fcf02..65321d24e 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs
@@ -26,9 +26,9 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
{
public int level;
public int exp;
- public GiftConfig normalGift;
- public GiftConfig luxuryGift;
- public GiftConfig supremeGift;
+ public List normalGiftList;
+ public List luxuryGiftList;
+ public List supremeGiftList;
public int payType;
public int payCount;
}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs
new file mode 100644
index 000000000..f99700151
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
+{
+ ///
+ /// 捕鱼房间配置
+ /// Swagger: FishRoomConfig
+ ///
+ [Serializable]
+ public class FishRoomConfig
+ {
+ ///
+ /// 手动选座限制（1=vip 2=代理商 3=普通用户）
+ /// 为 null 或空列表时不做限制
+ ///
+ public List seatSelectLimit;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs.meta
new file mode 100644
index 000000000..462e03fc4
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishRoomConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9d05c0727140f614db49548dc8127105
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/HallResponses.cs b/Assets/MyGame/Scripts/Net/APIResponses/HallResponses.cs
index d4399b787..bb2f1d240 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/HallResponses.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/HallResponses.cs
@@ -252,12 +252,9 @@ namespace Assets.MyGame.Scripts.Net.APIResponses
{
public int level;
public int exp;
- public int normalGiftType;
- public int normalGiftCount;
- public int luxuryGiftType;
- public int luxuryGiftCount;
- public int supremeGiftType;
- public int supremeGiftCount;
+ public List normalGiftList;
+ public List luxuryGiftList;
+ public List supremeGiftList;
}
[Serializable]
@@ -294,11 +291,11 @@ namespace Assets.MyGame.Scripts.Net.APIResponses
public string id;
public string userId;
public string number;
- public string remark;
+ public string remark; // 任务描述
public int taskType; // 任务类型
public int taskEvent; // 任务事件
public int taskCount; // 任务次数要求
- public int count; // 当前完成次数
+ public double count; // 当前完成次数（number 类型）
public bool isFinish; // 是否完成
public string otherId;
public bool isGet; // 是否已领取
diff --git a/Assets/MyGame/Scripts/Net/APIType.cs b/Assets/MyGame/Scripts/Net/APIType.cs
index 5b70b0cba..de348407c 100644
--- a/Assets/MyGame/Scripts/Net/APIType.cs
+++ b/Assets/MyGame/Scripts/Net/APIType.cs
@@ -327,6 +327,9 @@ namespace Assets.MyGame.Scripts.Net
/// 获取用户排行榜（GET） type: 1=金币 2=等级 3=今日消耗
Hall_GetRanking,
+ /// 获取象棋分区总数（GET）
+ Hall_GetChessRoomPartitionCount,
+
// ---------------- Customer ----------------
/// 发起会话（POST）
@@ -352,5 +355,8 @@ namespace Assets.MyGame.Scripts.Net
/// 获取聊天记录（GET）
Customer_ChatLog,
+
+ /// 获取我的会话列表（含消息）GET
+ Customer_MyConversations,
}
}
\ No newline at end of file
diff --git a/Assets/MyGame/Scripts/Net/WebResponses/BotConfig.cs b/Assets/MyGame/Scripts/Net/WebResponses/BotConfig.cs
index 25f01ae39..28031e9ad 100644
--- a/Assets/MyGame/Scripts/Net/WebResponses/BotConfig.cs
+++ b/Assets/MyGame/Scripts/Net/WebResponses/BotConfig.cs
@@ -43,7 +43,7 @@ public class BotSkillConfig
[Space]
[Header("锁定 - 自动瞄准最近鱼")]
- [Range(0f, 1f)] public float lockProb = 0.7f;
+ [Range(0f, 1f)] public float lockProb = 0f;
public float lockMinTime = 5f;
public float lockMaxTime = 20f;
diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager.cs b/Assets/MyGame/Scripts/Net/WebSocketManager.cs
index 32b32409f..757f4c63a 100644
--- a/Assets/MyGame/Scripts/Net/WebSocketManager.cs
+++ b/Assets/MyGame/Scripts/Net/WebSocketManager.cs
@@ -70,7 +70,7 @@ namespace Assets.MyGame.Scripts.Net
case SocketType.game:
break;
case SocketType.chess:
- WebSocketSendList.GetRoomListChineseChess(1);
+ UIManager.Instance.Get(UIPanel.MainGamePanelZGXQ).subUIManager.ShowAsync(UIPanel.ZGXQDistrict);
break;
case SocketType.customer:
break;
@@ -107,6 +107,10 @@ namespace Assets.MyGame.Scripts.Net
break;
case SocketType.chess:
+ //WebSocketSendList.GetRoomListChineseChess(1);
+ //UIManager.Instance.Get(UIPanel.MainGamePanelZGXQ).subUIManager.ShowAsync(UIPanel.ZGXQDistrict);
+ UIManager.Instance.ShowAsync(UIPanel.MainGamePanelZGXQ);
+
break;
case SocketType.customer:
break;
diff --git a/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab b/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab
index 751e5ff49..774e1d9ef 100644
--- a/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab
+++ b/Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab
@@ -972,7 +972,7 @@ MonoBehaviour:
giftPrefab: {fileID: 322732254292001805}
giftPrefabParent: {fileID: 5708383959453866398}
sprite_Gold: {fileID: 21300000, guid: f913511fd7e863d45ac93b62c7fd4354, type: 3}
- sprite_Diamond: {fileID: 21300000, guid: f913511fd7e863d45ac93b62c7fd4354, type: 3}
+ sprite_Diamond: {fileID: 21300000, guid: fb8cf8f90dbe44b41b021f64c8d08a56, type: 3}
btn_Get: {fileID: 7759498890616408438}
maskMat: {fileID: 2100000, guid: 16fb6fc82be36a540a74d11f90c0db6b, type: 2}
eraseMat: {fileID: 2100000, guid: 3261f5202cdff64409572045cc75834c, type: 2}
diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab
index b44a5c988..880cbdb0a 100644
--- a/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab
+++ b/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab
@@ -34,7 +34,7 @@ RectTransform:
m_Father: {fileID: 358166129368429010}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -151,141 +151,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &457477740637138592
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3490435177713276006}
- - component: {fileID: 4862033817013676318}
- - component: {fileID: 2445407450370139873}
- m_Layer: 5
- m_Name: Text (TMP) (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &3490435177713276006
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 457477740637138592}
- 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: 1686468845713917608}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4862033817013676318
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 457477740637138592}
- m_CullTransparentMesh: 1
---- !u!114 &2445407450370139873
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 457477740637138592}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: "\u8C61\u68CB\u4E00\u533A"
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2}
- m_sharedMaterial: {fileID: 422999905340497036, guid: 7cb7af7685a457443a295fdaa17beeea,
- type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4278190335
- m_fontColor: {r: 1, g: 0, b: 0, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 23.1
- m_fontSizeBase: 23.1
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1019335743602089952
GameObject:
m_ObjectHideFlags: 0
@@ -393,141 +258,6 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
---- !u!1 &1140874608701212498
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8680042994300772472}
- - component: {fileID: 7494654602773928546}
- - component: {fileID: 8439356682486307147}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8680042994300772472
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1140874608701212498}
- 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: 6712131649239169743}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7494654602773928546
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1140874608701212498}
- m_CullTransparentMesh: 1
---- !u!114 &8439356682486307147
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1140874608701212498}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: "\u8C61\u68CB\u4E8C\u533A"
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2}
- m_sharedMaterial: {fileID: 422999905340497036, guid: 7cb7af7685a457443a295fdaa17beeea,
- type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 23.1
- m_fontSizeBase: 23.1
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1291800488841944919
GameObject:
m_ObjectHideFlags: 0
@@ -630,81 +360,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &1366797980344162995
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 237701053252295418}
- - component: {fileID: 1527117996295753389}
- - component: {fileID: 7179493917508544553}
- m_Layer: 0
- m_Name: group_btn
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &237701053252295418
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1366797980344162995}
- 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: 6712131649239169743}
- 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: 1.4981995, y: 0.7524414}
- m_SizeDelta: {x: 124, y: 72}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1527117996295753389
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1366797980344162995}
- m_CullTransparentMesh: 1
---- !u!114 &7179493917508544553
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1366797980344162995}
- 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: eb3138b3bbf31144b928eba5c41f15db, 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 &2155146865339889995
GameObject:
m_ObjectHideFlags: 0
@@ -1154,280 +809,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &3565399249084293644
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6712131649239169743}
- - component: {fileID: 5273292554652498376}
- - component: {fileID: 4885951860735598880}
- - component: {fileID: 2460169349960377096}
- m_Layer: 5
- m_Name: "-h-\u7EC4 34 (7)"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6712131649239169743
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3565399249084293644}
- 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:
- - {fileID: 8680042994300772472}
- - {fileID: 237701053252295418}
- - {fileID: 235800690493044443}
- m_Father: {fileID: 5073449037799569824}
- 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: 126, y: 72}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5273292554652498376
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3565399249084293644}
- m_CullTransparentMesh: 1
---- !u!114 &4885951860735598880
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3565399249084293644}
- 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: 0.95686275}
- 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: 94bc9a5df981ef24686dacf4c949ac24, 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!114 &2460169349960377096
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3565399249084293644}
- 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: 4885951860735598880}
- toggleTransition: 1
- graphic: {fileID: 7179493917508544553}
- m_Group: {fileID: 0}
- onValueChanged:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 8236644667407248813}
- 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 &3877520709242777267
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4321712173342848749}
- - component: {fileID: 5320745389972045122}
- - component: {fileID: 2912276401496249227}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4321712173342848749
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3877520709242777267}
- 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: 1686468845713917608}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5320745389972045122
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3877520709242777267}
- m_CullTransparentMesh: 1
---- !u!114 &2912276401496249227
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3877520709242777267}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: "\u8C61\u68CB\u4E00\u533A"
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2}
- m_sharedMaterial: {fileID: 422999905340497036, guid: 7cb7af7685a457443a295fdaa17beeea,
- type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 23.1
- m_fontSizeBase: 23.1
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3995183889294477119
GameObject:
m_ObjectHideFlags: 0
@@ -1580,145 +961,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &4428520959673327017
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1686468845713917608}
- - component: {fileID: 5677427573248169001}
- - component: {fileID: 6259707457737286695}
- - component: {fileID: 654735463165621105}
- m_Layer: 5
- m_Name: "-h-\u7EC4 34 (7)"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1686468845713917608
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4428520959673327017}
- 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:
- - {fileID: 4321712173342848749}
- - {fileID: 8424574150766211481}
- - {fileID: 3490435177713276006}
- m_Father: {fileID: 7424860594244896561}
- 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: 126, y: 72}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5677427573248169001
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4428520959673327017}
- m_CullTransparentMesh: 1
---- !u!114 &6259707457737286695
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4428520959673327017}
- 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: 0.95686275}
- 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: 94bc9a5df981ef24686dacf4c949ac24, 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!114 &654735463165621105
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4428520959673327017}
- 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: 6259707457737286695}
- toggleTransition: 1
- graphic: {fileID: 5091090027818359132}
- m_Group: {fileID: 0}
- onValueChanged:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 457477740637138592}
- 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 &4678083465882117090
GameObject:
m_ObjectHideFlags: 0
@@ -1844,51 +1086,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
---- !u!1 &5581117951776121816
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5073449037799569824}
- - component: {fileID: 7631087481949522533}
- m_Layer: 5
- m_Name: "-h-\u7EC4 34 (7)"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &5073449037799569824
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5581117951776121816}
- 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:
- - {fileID: 6712131649239169743}
- m_Father: {fileID: 5504888745145859652}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 130.045, y: -120}
- m_SizeDelta: {x: 200.09, y: 80}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7631087481949522533
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5581117951776121816}
- m_CullTransparentMesh: 1
--- !u!1 &5793349492125778575
GameObject:
m_ObjectHideFlags: 0
@@ -2257,7 +1454,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 7387575192802080277}
toggleTransition: 1
graphic: {fileID: 1340755762064431164}
- m_Group: {fileID: 0}
+ m_Group: {fileID: 8295720194246181454}
onValueChanged:
m_PersistentCalls:
m_Calls:
@@ -2488,51 +1685,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6598896922058811580
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7424860594244896561}
- - component: {fileID: 8573315565771256190}
- m_Layer: 5
- m_Name: "-h-\u7EC4 34 (6)"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &7424860594244896561
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6598896922058811580}
- 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:
- - {fileID: 1686468845713917608}
- m_Father: {fileID: 5504888745145859652}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 130.045, y: -40}
- m_SizeDelta: {x: 200.09, y: 80}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8573315565771256190
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6598896922058811580}
- m_CullTransparentMesh: 1
--- !u!1 &6717529541249493207
GameObject:
m_ObjectHideFlags: 0
@@ -3064,216 +2216,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &7944315236066446113
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8424574150766211481}
- - component: {fileID: 1833390591051132107}
- - component: {fileID: 5091090027818359132}
- m_Layer: 0
- m_Name: group_btn
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8424574150766211481
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7944315236066446113}
- 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: 1686468845713917608}
- 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: 1.4981995, y: 0.7524414}
- m_SizeDelta: {x: 124, y: 72}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1833390591051132107
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7944315236066446113}
- m_CullTransparentMesh: 1
---- !u!114 &5091090027818359132
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7944315236066446113}
- 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: eb3138b3bbf31144b928eba5c41f15db, 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 &8236644667407248813
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 235800690493044443}
- - component: {fileID: 859031014855057725}
- - component: {fileID: 3876006377639815375}
- m_Layer: 5
- m_Name: Text (TMP) (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &235800690493044443
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8236644667407248813}
- 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: 6712131649239169743}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &859031014855057725
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8236644667407248813}
- m_CullTransparentMesh: 1
---- !u!114 &3876006377639815375
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8236644667407248813}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: "\u8C61\u68CB\u4E00\u533A"
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2}
- m_sharedMaterial: {fileID: 422999905340497036, guid: 7cb7af7685a457443a295fdaa17beeea,
- type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4278190335
- m_fontColor: {r: 1, g: 0, b: 0, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 23.1
- m_fontSizeBase: 23.1
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8517111867897004488
GameObject:
m_ObjectHideFlags: 0
@@ -3305,9 +2247,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
- m_Children:
- - {fileID: 7424860594244896561}
- - {fileID: 5073449037799569824}
+ m_Children: []
m_Father: {fileID: 2058710337491920510}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab
index 34bd1bdbf..c5fd5241f 100644
--- a/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab
+++ b/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab
@@ -2750,7 +2750,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 8211565708645173749}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 3126247594640834412}
+ m_TargetAssemblyTypeName: TMPro.TMP_InputField, Unity.TextMeshPro
+ m_MethodName: set_text
+ m_Mode: 5
+ 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
--- !u!1 &7501219224753447274
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs
index 2126a7b4b..98c1e2fbf 100644
--- a/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs
+++ b/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs
@@ -144,6 +144,7 @@ public class ChineseChessMainPanel : GameMainPanel_Base
// 房主点击开始 → 隐藏开始按钮，弹出金币设置
btn_StartGame.gameObject.SetActive(false);
StopWaitCountdown();
+
subUIManager.ShowAsync(UIPanel.ZGXQSelectCoin, chessGameRoom);
StartWaitCountdown(60, CountdownType.WaitSetCoin, "等待设置金额");
});
@@ -211,9 +212,6 @@ public class ChineseChessMainPanel : GameMainPanel_Base
if (img_DengDaiZhong != null)
{
img_DengDaiZhong.gameObject.SetActive(active);
- // 控制父对象的父对象
- if (img_DengDaiZhong.transform.parent != null && img_DengDaiZhong.transform.parent.parent != null)
- img_DengDaiZhong.transform.parent.parent.gameObject.SetActive(active);
}
}
public void IsShowHint(string id,int type)
diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs
index 119e5bdb1..f062e4f17 100644
--- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs
+++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs
@@ -43,14 +43,15 @@ public class UIChineseChessDistrict : SubUIBase
base.OnShow(args);
tmp_CurrGold.text = GameManager.Instance.user.assets.gold.ToString();
- // 从后端配置读取分区数
- maxDistrict = GameManager.Instance?.gameConfig?.chessConfig?.districtCount ?? 10;
- if (maxDistrict <= 0) maxDistrict = 1;
-
if (!_tabsBuilt)
{
- BuildChessFenQuTabs();
- _tabsBuilt = true;
+ // 从后端 API 获取分区总数
+ APIRequestList.GetChessRoomPartitionCount(count =>
+ {
+ maxDistrict = count > 0 ? count : 1;
+ BuildChessFenQuTabs();
+ _tabsBuilt = true;
+ });
}
}
@@ -130,7 +131,11 @@ public class UIChineseChessDistrict : SubUIBase
var tab = Instantiate(tra_FenQuItem, tra_DaQuParent);
// child0 = Toggle容器, child0.child0 = TextMeshProUGUI
if (tab.childCount > 0 && tab.GetChild(0) != null && tab.GetChild(0).childCount > 0)
+ {
tab.GetChild(0).GetChild(0).GetComponent().text = "象棋" + ToChineseNumber(d) + "区";
+ tab.GetChild(0).GetChild(2).GetComponent().text = "象棋" + ToChineseNumber(d) + "区";
+ }
+
int district = d;
var toggle = tab.GetChild(0).GetComponent();
@@ -157,6 +162,18 @@ public class UIChineseChessDistrict : SubUIBase
});
}
}
+
+ // 默认选中一区
+ if (tra_DaQuParent.childCount > 0)
+ {
+ var firstTab = tra_DaQuParent.GetChild(0);
+ if (firstTab.childCount > 0)
+ {
+ var firstToggle = firstTab.GetChild(0).GetComponent();
+ if (firstToggle != null)
+ firstToggle.isOn = true;
+ }
+ }
}
private static string ToChineseNumber(int n)
diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs
index 580e8df85..4de0df7a8 100644
--- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs
+++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs
@@ -12,13 +12,19 @@ public class UIChineseChessSetCoin : SubUIBase
public TMP_InputField tmpInput_Coin;
public Button btn_Enter;
public List