diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
index f6b273735..62b7ab554 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -22,11 +22,31 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 11bbb1de935476d42a25db84ac76bdd6
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/2JoinRoom.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 1a4426e8e3677f946b62022e2bfa5283
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/Win.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 1d00d35458af5834ab598e9d96bb01ba
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/Hint.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 26f68c48bf8dba74dba3fe7f38ae6e60
m_Address: XJMHCreateFish.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 2924d71e1ebb90046bc43b6f34cebae6
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/2.5CurrentExplain.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2ae29ff90f8f1ba42aafd95293932c59
m_Address: Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab
m_ReadOnly: 0
@@ -42,6 +62,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 449acbc395d11614e9ded7b080f73fb0
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 47c83c32cd8a2e247a31ae49ef81858e
m_Address: Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab
m_ReadOnly: 0
@@ -52,16 +77,36 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 55d177804cf2c6a419371a676d6d87c8
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/Setting.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 59a126c905bf04145a58ec1b94711673
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/defeated.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 62bda8aec1cfb1749aadcfe3ef48ee05
m_Address: Assets/MyGame/aa/UI/Home/Sub/MonthCardPanel.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 8098018ff11d33f4e8edaa9e53d5b568
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8da2f97ccd96f8044b1c634d075e27f7
m_Address: Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 904a2cfeccbd78743b7d31af945a117c
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/2CreateRoom.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9351da778e1c18c4f9243b73d7569c66
m_Address: Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
m_ReadOnly: 0
@@ -87,6 +132,16 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: ad37004de2fb47f468b119a0b528ac78
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: b3b06e3310b34c944b3b76a91b8d17ed
+ m_Address: Assets/MyGame/aa/UI/Game/ChineseChess/Introduce.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c48b9e15c1940764a9da95551887a147
m_Address: Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab
m_ReadOnly: 0
diff --git a/Assets/Framework/Tool/UITool/SubUIManager.cs b/Assets/Framework/Tool/UITool/SubUIManager.cs
index 7d230c10e..2952fea78 100644
--- a/Assets/Framework/Tool/UITool/SubUIManager.cs
+++ b/Assets/Framework/Tool/UITool/SubUIManager.cs
@@ -32,7 +32,7 @@ public class SubUIManager
///
///
///
- public async void ShowAsync(UIPanel type, object args = null, System.Action onShown = null)
+ public async void ShowAsync(UIPanel type, object args = null)
{
if (addressMap.ContainsKey(type)) {
diff --git a/Assets/Framework/Tool/UITool/UIManager.cs b/Assets/Framework/Tool/UITool/UIManager.cs
index 958de8d76..d88aa428f 100644
--- a/Assets/Framework/Tool/UITool/UIManager.cs
+++ b/Assets/Framework/Tool/UITool/UIManager.cs
@@ -48,7 +48,16 @@ public enum UIPanel
SettingPanel = 199,
#endregion
#region 200-299 Game界面
-
+ ZGXQDistrict= 251,
+ ZGXQCreateRoom=252,
+ ZGXQSelectCoin=2521,
+ ZGXQGameExplain=2522,
+ ZGXQJoinGame=253,
+ ZGXQWin = 254,
+ ZGXQDefeated= 255,
+ ZGXQSetting=256,
+ ZGXQHint=257,
+ ZGXQIntroduce = 258,
#endregion
@@ -82,7 +91,35 @@ public class UIManager : MonoSingleton
uiRoot = canvas != null ? canvas.transform : transform;
}
}
+ ///
+ /// 同步显示(若未实例化则立即实例化)
+ ///
+ public T Show(UIPanel type, object args = null) where T : UIBase
+ {
+ if (addressMap.ContainsKey(type))
+ {
+ // 模拟异步:此处可替换为真正的资源加载(Addressables/AssetBundle)
+ var handle = Addressables.LoadAsset(addressMap[type]);
+ if (handle.Status == AsyncOperationStatus.Succeeded)
+ {
+ var panel = GetOrCreatePanel(type, handle.Result);
+ panel?.Show(args);
+ return (T)panel;
+ }
+ else
+ {
+ Debug.LogError($"Failed to load UI prefab for {type}");
+ return null;
+ }
+
+ }
+ else
+ {
+ Debug.Log("加载失败" + type.ToString() + "不存在");
+ return null;
+ }
+ }
///
/// 同步显示(若未实例化则立即实例化)
///
@@ -111,11 +148,6 @@ public class UIManager : MonoSingleton
Debug.Log("加载失败" + type.ToString() + "不存在");
return null;
}
-
-
-
-
-
}
///
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index 918a099ef..3e7920da7 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -122,96 +122,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &119606143
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 119606144}
- - component: {fileID: 119606147}
- - component: {fileID: 119606146}
- - component: {fileID: 119606145}
- m_Layer: 5
- m_Name: Viewport
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &119606144
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 119606143}
- 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: 1827576623}
- m_Father: {fileID: 1908489804}
- 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: -17, y: -17}
- m_Pivot: {x: 0, y: 1}
---- !u!114 &119606145
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 119606143}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 0
---- !u!114 &119606146
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 119606143}
- 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: 10917, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- 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!222 &119606147
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 119606143}
- m_CullTransparentMesh: 1
--- !u!1 &159595480
GameObject:
m_ObjectHideFlags: 0
@@ -379,81 +289,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 18.704224, y: 70.2}
m_EdgeRadius: 0
---- !u!1 &453683470
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 453683471}
- - component: {fileID: 453683473}
- - component: {fileID: 453683472}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &453683471
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 453683470}
- 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: 1827576623}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 50, y: -50}
- m_SizeDelta: {x: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &453683472
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 453683470}
- 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: 0}
- 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!222 &453683473
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 453683470}
- m_CullTransparentMesh: 1
--- !u!1 &492562954
GameObject:
m_ObjectHideFlags: 0
@@ -591,132 +426,6 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
---- !u!1 &525155187
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 525155188}
- - component: {fileID: 525155191}
- - component: {fileID: 525155190}
- - component: {fileID: 525155189}
- m_Layer: 5
- m_Name: Scrollbar Horizontal
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &525155188
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 525155187}
- 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: 925602294}
- m_Father: {fileID: 1908489804}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: -17, y: 20}
- m_Pivot: {x: 0, y: 0}
---- !u!114 &525155189
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 525155187}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1916840565}
- m_HandleRect: {fileID: 1916840564}
- m_Direction: 0
- m_Value: 0
- m_Size: 1
- m_NumberOfSteps: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &525155190
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 525155187}
- 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: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- 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!222 &525155191
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 525155187}
- m_CullTransparentMesh: 1
--- !u!1 &757015530
GameObject:
m_ObjectHideFlags: 0
@@ -794,174 +503,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 112.25, y: 11.973297}
m_EdgeRadius: 0
---- !u!1 &802513606
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 802513607}
- - component: {fileID: 802513610}
- - component: {fileID: 802513609}
- - component: {fileID: 802513608}
- m_Layer: 5
- m_Name: Scrollbar Vertical
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &802513607
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 802513606}
- 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: 2132470402}
- m_Father: {fileID: 1908489804}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 20, y: -17}
- m_Pivot: {x: 1, y: 1}
---- !u!114 &802513608
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 802513606}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1622451015}
- m_HandleRect: {fileID: 1622451014}
- m_Direction: 2
- m_Value: 0
- m_Size: 1
- m_NumberOfSteps: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &802513609
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 802513606}
- 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: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- 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!222 &802513610
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 802513606}
- m_CullTransparentMesh: 1
---- !u!224 &808018685 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- m_PrefabInstance: {fileID: 1023033605}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &925602293
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 925602294}
- m_Layer: 5
- m_Name: Sliding Area
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &925602294
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 925602293}
- 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: 1916840564}
- m_Father: {fileID: 525155188}
- 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: -20, y: -20}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &986838753
GameObject:
m_ObjectHideFlags: 0
@@ -1039,204 +580,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 112.25, y: 11.973297}
m_EdgeRadius: 0
---- !u!1001 &1023033605
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1096182889}
- m_Modifications:
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1168244435367184264, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1972522563859926499, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_Name
- value: MainPanel
- objectReference: {fileID: 0}
- - target: {fileID: 1972522563859926499, guid: c9d33ae16c3d94045817f048b78914cc,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: c9d33ae16c3d94045817f048b78914cc, type: 3}
---- !u!1 &1053013233
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1053013234}
- - component: {fileID: 1053013236}
- - component: {fileID: 1053013235}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1053013234
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1053013233}
- 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: 1096182889}
- 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!114 &1053013235
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1053013233}
- 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: 90574c4188af77d4aab713f618e500ce, 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!222 &1053013236
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1053013233}
- m_CullTransparentMesh: 1
--- !u!1 &1096182885
GameObject:
m_ObjectHideFlags: 0
@@ -1330,12 +673,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 808018685}
- - {fileID: 1524437885}
- - {fileID: 1053013234}
- - {fileID: 1756072796}
- - {fileID: 1908489804}
+ m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -1420,424 +758,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 18.704224, y: 70.2}
m_EdgeRadius: 0
---- !u!224 &1524437885 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- m_PrefabInstance: {fileID: 1686989878067560349}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &1622451013
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1622451014}
- - component: {fileID: 1622451016}
- - component: {fileID: 1622451015}
- m_Layer: 5
- m_Name: Handle
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1622451014
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1622451013}
- 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: 2132470402}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 0.9999999}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 20, y: 20}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1622451015
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1622451013}
- 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- 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!222 &1622451016
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1622451013}
- m_CullTransparentMesh: 1
---- !u!1 &1756072795
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1756072796}
- - component: {fileID: 1756072798}
- - component: {fileID: 1756072797}
- m_Layer: 5
- m_Name: Image (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1756072796
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1756072795}
- 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: 1096182889}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 704, y: 360}
- m_SizeDelta: {x: 1280, y: 720}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1756072797
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1756072795}
- 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: 601a94d84ee753d44ac194a8695d6bce, 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!222 &1756072798
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1756072795}
- m_CullTransparentMesh: 1
---- !u!1 &1827576622
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1827576623}
- - component: {fileID: 1827576625}
- - component: {fileID: 1827576624}
- m_Layer: 5
- m_Name: Content
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1827576623
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1827576622}
- 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: 453683471}
- m_Father: {fileID: 119606144}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 100}
- m_Pivot: {x: 0, y: 1}
---- !u!114 &1827576624
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1827576622}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 0
- m_Spacing: 0
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 1
- m_ChildControlWidth: 0
- m_ChildControlHeight: 0
- m_ChildScaleWidth: 0
- m_ChildScaleHeight: 0
- m_ReverseArrangement: 0
---- !u!114 &1827576625
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1827576622}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 0
- m_VerticalFit: 2
---- !u!1 &1908489803
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1908489804}
- - component: {fileID: 1908489807}
- - component: {fileID: 1908489806}
- - component: {fileID: 1908489805}
- m_Layer: 5
- m_Name: Scroll View
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1908489804
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1908489803}
- 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: 119606144}
- - {fileID: 525155188}
- - {fileID: 802513607}
- m_Father: {fileID: 1096182889}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -14.95459, y: 11.73877}
- m_SizeDelta: {x: -157.9091, y: -164.3411}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1908489805
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1908489803}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Content: {fileID: 1827576623}
- m_Horizontal: 0
- m_Vertical: 1
- m_MovementType: 1
- m_Elasticity: 0.1
- m_Inertia: 1
- m_DecelerationRate: 0.135
- m_ScrollSensitivity: 1
- m_Viewport: {fileID: 119606144}
- m_HorizontalScrollbar: {fileID: 525155189}
- m_VerticalScrollbar: {fileID: 802513608}
- m_HorizontalScrollbarVisibility: 2
- m_VerticalScrollbarVisibility: 2
- m_HorizontalScrollbarSpacing: -3
- m_VerticalScrollbarSpacing: -3
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &1908489806
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1908489803}
- 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.392}
- 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: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- 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!222 &1908489807
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1908489803}
- m_CullTransparentMesh: 1
---- !u!1 &1916840563
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1916840564}
- - component: {fileID: 1916840566}
- - component: {fileID: 1916840565}
- m_Layer: 5
- m_Name: Handle
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1916840564
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1916840563}
- 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: 925602294}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0.9999998, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 20, y: 20}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1916840565
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1916840563}
- 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- 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!222 &1916840566
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1916840563}
- m_CullTransparentMesh: 1
--- !u!1 &1931237641
GameObject:
m_ObjectHideFlags: 0
@@ -2233,325 +1153,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
---- !u!1 &2132470401
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2132470402}
- m_Layer: 5
- m_Name: Sliding Area
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &2132470402
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2132470401}
- 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: 1622451014}
- m_Father: {fileID: 802513607}
- 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: -20, y: -20}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!1001 &1686989878067560349
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1096182889}
- m_Modifications:
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 245637205031072731, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 890772451510707987, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 890772451510707987, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 890772451510707987, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 1216.5377
- objectReference: {fileID: 0}
- - target: {fileID: 890772451510707987, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -51
- objectReference: {fileID: 0}
- - target: {fileID: 1949727621758752760, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1949727621758752760, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1949727621758752760, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 282.91998
- objectReference: {fileID: 0}
- - target: {fileID: 1949727621758752760, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -60
- objectReference: {fileID: 0}
- - target: {fileID: 2856141562549588388, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_Name
- value: GameMainPanelXJMH
- objectReference: {fileID: 0}
- - target: {fileID: 2856141562549588388, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3466874122975853776, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3466874122975853776, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3466874122975853776, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 184.45999
- objectReference: {fileID: 0}
- - target: {fileID: 3466874122975853776, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -60
- objectReference: {fileID: 0}
- - target: {fileID: 3513126800427788133, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3513126800427788133, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3513126800427788133, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 1297.5377
- objectReference: {fileID: 0}
- - target: {fileID: 3513126800427788133, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -51
- objectReference: {fileID: 0}
- - target: {fileID: 4349789687743433065, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4349789687743433065, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4349789687743433065, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 1378.5377
- objectReference: {fileID: 0}
- - target: {fileID: 4349789687743433065, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -51
- objectReference: {fileID: 0}
- - target: {fileID: 6473552976031941804, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6473552976031941804, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6473552976031941804, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 1459.5377
- objectReference: {fileID: 0}
- - target: {fileID: 6473552976031941804, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -51
- objectReference: {fileID: 0}
- - target: {fileID: 8199332232608768190, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8199332232608768190, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8199332232608768190, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 1540.5377
- objectReference: {fileID: 0}
- - target: {fileID: 8199332232608768190, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -50.5
- objectReference: {fileID: 0}
- - target: {fileID: 8926196532408561376, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8926196532408561376, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8926196532408561376, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 86
- objectReference: {fileID: 0}
- - target: {fileID: 8926196532408561376, guid: d363cbe64e437a84c8062a580c563834,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -60
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: d363cbe64e437a84c8062a580c563834, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/Scripts/Manager/GameManager.cs b/Assets/MyGame/Scripts/Manager/GameManager.cs
index 93f2120c8..314c9d660 100644
--- a/Assets/MyGame/Scripts/Manager/GameManager.cs
+++ b/Assets/MyGame/Scripts/Manager/GameManager.cs
@@ -38,7 +38,9 @@ public class GameManager : MonoSingleton
UIManager.Instance.ShowAsync(UIPanel.MainGamePanelDefault);
break;
case GameType.ZGXQ:
- UIManager.Instance.ShowAsync(UIPanel.MainGamePanelDefault);
+ //UIManager.Instance.ShowAsync(UIPanel.MainGamePanelZGXQ);
+ //这里设置触发棋盘的初始化
+
break;
case GameType.XJMH:
WebSocketManager.Instance.Connect(SocketType.game);
diff --git a/Assets/MyGame/Scripts/Net/APIManager.cs b/Assets/MyGame/Scripts/Net/APIManager.cs
index bb27aa5c6..ed520fc34 100644
--- a/Assets/MyGame/Scripts/Net/APIManager.cs
+++ b/Assets/MyGame/Scripts/Net/APIManager.cs
@@ -15,7 +15,8 @@ namespace Assets.MyGame.Scripts.Net
public static class APIManager
{
public static Dictionary dic_API = new Dictionary();
- public const string baseURL = "http://game5241.wzaxr.top";
+ //public const string baseURL = "http://game5241.wzaxr.top";
+ public const string baseURL = "http://524game.32.hzgqapp.com";
static string token;
static APIManager()
diff --git a/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess.meta b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess.meta
new file mode 100644
index 000000000..d39a8cf64
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7944bbb7eb3c33442bb8ed8cb25c7818
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs
new file mode 100644
index 000000000..c3b409419
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs
@@ -0,0 +1,135 @@
+using Model.Entity.BaseModel;
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess
+{
+ [Serializable]
+ public class ChineseChessGameClassList
+ {
+ ///
+ /// 创建房间参数
+ ///
+ public class CreateRoomParam
+ {
+
+ ///
+ /// 房间id
+ ///
+ public string roomId { get; set; }
+
+ ///
+ /// 用户ID
+ ///
+ public string userId { get; set; }
+ ///
+
+
+ ///
+ /// 游戏类型 1 我方黑 2 我方红
+ ///
+ public int gameType { get; set; }
+
+ ///
+ /// 密码,可为空字符串
+ ///
+ public string password { get; set; }
+
+ ///
+ /// 金币数量
+ ///
+ public int gold { get; set; } = 1000;
+ }
+ [Serializable]
+ ///
+ /// 游戏房间
+ ///
+ public class ChessGameRoom : MongoBaseEntity
+ {
+ ///
+ /// 用户列表
+ ///
+ public List users { get; set; } = new List();
+ ///
+ /// 房间id
+ ///
+ public string roomId { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime createTime { get; set; }
+
+ ///
+ /// 游戏类型 1 我方黑 2 我方红
+ ///
+ public int gameType { get; set; }
+
+ ///
+ /// 密码,可为空字符串
+ ///
+ public string password { get; set; }
+
+ ///
+ /// 创建者id
+ ///
+ public string createUserId { get; set; }
+
+ ///
+ /// 状态 1 未开始 2 进行中 3 已结束
+ ///
+ public int state { get; set; } = 1;
+ ///
+ /// 金币数量
+ ///
+ public int gold { get; set; } = 1000;
+ }
+ [Serializable]
+ ///
+ /// 缓存中的游戏用户模型
+ ///
+ public class RedisGameUser
+ {
+
+ ///
+ /// 链接Id
+ ///
+ public string cid { get; set; }
+ ///
+ /// 用户ID
+ ///
+ public string userId { get; set; }
+ ///
+ /// 用户名称
+ ///
+
+ public string userName { get; set; }
+
+ ///
+ /// 用户头像
+ ///
+ public string userAvatar { get; set; }
+
+ ///
+ /// 用户类型 1 黑方 2 红方
+ ///
+ public int type { get; set; }
+ ///
+ /// 是否掉线
+ ///
+ public bool isLeave { get; set; } = false;
+
+ ///
+ /// 是否准备
+ ///
+ public bool isReady { get; set; } = false;
+ ///
+ /// 金币数量
+ ///
+ public int gold { get; set; } = 0;
+ }
+
+
+
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs.meta b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs.meta
new file mode 100644
index 000000000..406168738
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eb3f5d9b10bf6ec4f932bf6b1ef481a3
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager.cs b/Assets/MyGame/Scripts/Net/WebSocketManager.cs
index 014d66f06..426f5f539 100644
--- a/Assets/MyGame/Scripts/Net/WebSocketManager.cs
+++ b/Assets/MyGame/Scripts/Net/WebSocketManager.cs
@@ -21,7 +21,8 @@ namespace Assets.MyGame.Scripts.Net
private readonly Dictionary sockets = new();
private readonly Dictionary socketPaths = new();
- private const string baseUrl = "ws://game5241.wzaxr.top";
+ //private const string baseUrl = "ws://game5241.wzaxr.top";
+ private const string baseUrl = "ws://524game.32.hzgqapp.com";
protected override void Awake()
{
@@ -30,13 +31,13 @@ namespace Assets.MyGame.Scripts.Net
socketPaths[SocketType.game] = "/gamehub";
socketPaths[SocketType.room] = "/fishingroomhub";
socketPaths[SocketType.login] = "/loginhub";
- socketPaths[SocketType.chess] = "/chesshub";
+ socketPaths[SocketType.chess] = "/chessgamehub";
}
///
/// 创建或返回已存在的 WebSocket
///
- public WebSocket Connect(SocketType type)
+ public WebSocket Connect(SocketType type,Action action=null)
{
// 已存在则直接返回
if (sockets.TryGetValue(type, out var exist))
@@ -44,7 +45,23 @@ namespace Assets.MyGame.Scripts.Net
if (exist.IsOpen)
{
Debug.Log($"[WebSocket] {type} 已连接,直接返回");
- WebSocketSendList.JoinRoom("11109", GameManager.Instance.user.id, 1);
+ switch (type)
+ {
+ case SocketType.login:
+ break;
+ case SocketType.room:
+ //WebSocketSendList.JoinRoom("11109", GameManager.Instance.user.id, 1);
+ break;
+ case SocketType.game:
+ break;
+ case SocketType.chess:
+ WebSocketSendList.GetRoomListChineseChess(1);
+ break;
+ default:
+ break;
+ }
+
+
return exist;
}
}
@@ -74,7 +91,8 @@ namespace Assets.MyGame.Scripts.Net
default:
break;
}
-
+ if (action != null)
+ action?.Invoke();
};
ws.OnClosed += (web, code, reason) =>
diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
index 362a530dd..c7dec30e4 100644
--- a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
+++ b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
@@ -15,14 +15,69 @@ namespace Assets.MyGame.Scripts.Net
{
Debug.Log($"[WebSocket] {type} 收到消息: {msg}");
- msg = msg.Substring(0, msg.Length - 1);
- var v = JsonConvert.DeserializeObject>(msg);
- if (v == null)
+ string[] msgs = msg.Split('\u001e');
+ foreach (var item in msgs)
{
- return;
+ var v = JsonConvert.DeserializeObject>(item);
+ if (v == null)
+ {
+ return;
+ }
+ // TODO: 这里可以做统一消息分发
+ #region 消息处理
+ switch (type)
+ {
+ case SocketType.login:
+ case SocketType.room:
+ case SocketType.game:
+ FishMSG(item, v);
+ break;
+ case SocketType.chess:
+ ChineseChess(item, v);
+ break;
+ default:
+ break;
+ }
}
- // TODO: 这里可以做统一消息分发
- #region 消息处理
+
+
+ #endregion
+
+ }
+ private static void ChineseChess(string msg, WebSocketResponseBase