1

2026-05-02 23:52:48 +08:00
parent 8a4e082e6c
commit 8dbcbd17b5
24 changed files with 9751 additions and 16747 deletions
@@ -0,0 +1,20 @@
+using UnityEngine;
+
+public static class ClipboardUtility
+{
+    /// <summary>
+    /// 设置剪贴板文本（Windows / macOS / iOS / Android 通用）
+    /// </summary>
+    public static void SetText(string text)
+    {
+        GUIUtility.systemCopyBuffer = text ?? string.Empty;
+    }
+
+    /// <summary>
+    /// 获取剪贴板文本（Windows / macOS / iOS / Android 通用）
+    /// </summary>
+    public static string GetText()
+    {
+        return GUIUtility.systemCopyBuffer;
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2ea59a640a284524d8d6d4433be059c1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -15,7 +15,7 @@ public class SubUIBase : UIBase

    [HideInInspector] public SubUIManager uIManager;
    public Button btn_Close;
-    Vector3 standardSize;
+    Vector3 standardSize=Vector3.one;
    public UIEffect uIEffect=UIEffect.tan;
    public virtual void Awake()
    {
@@ -38,7 +38,7 @@ namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess
            /// <summary>
            /// 金币数量
            /// </summary>
-            public int gold { get; set; } = 1000;
+            public int gold { get; set; }
        }
        [Serializable]
        /// <summary>
@@ -82,7 +82,7 @@ namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess
            /// <summary>
            /// 金币数量
            /// </summary>
-            public int gold { get; set; } = 1000;
+            public int gold { get; set; }
        }
        [Serializable]
        /// <summary>
@@ -164,7 +164,7 @@ namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess
            /// <summary>
            /// 金币数量
            /// </summary>
-            public int gold { get; set; } = 0;
+            public int gold { get; set; }
        }


@@ -1,125 +1,260 @@
-using Assets.MyGame.Scripts.Net.API;
-using Spine.Unity;
+//using Assets.MyGame.Scripts.Net.API;
+//using Spine.Unity;
+//using System;
+//using System.Collections;
+//using System.Collections.Generic;
+//using System.Linq;
+//using TMPro;
+//using Unity.VisualScripting;
+//using UnityEngine;
+//using UnityEngine.UI;
+
+//public class SitPosData : MonoBehaviour
+//{
+//    [Header("用户id")]
+//    public string user;
+//    [Header("座位id")]
+//    public int posID;
+//    [Header("金币")]
+//    public TextMeshProUGUI tMP_TurretConsumeNum;
+//    public TextMeshProUGUI tMP_GoldNum;
+
+//    public Button btn_TurretAdd;
+//    public Button btn_TurretMinus;
+
+//    public long goldNum;
+//    public long consumeGoldNum;
+//    [Header("炮台")]
+//    public Dictionary<string, TurretData> dic_Turrets=new Dictionary<string, TurretData>();
+//    public List<TurretData> list_Turrets=new List<TurretData>();
+//    public int currentTurretIndex = 0;
+//    public string currentTurretID = "";
+//    public TurretData currentTurret;
+//    [Header("锁定")]
+//    public MonsterContral monCotl_Lock;
+//    public Transform monCotl_Lock_Position;
+//    public bool isLock=false;
+//    public GameObject lockFX;
+
+//    [Header("当前炮塔")]
+//    public Transform tra_CurrTurret;
+//    public Transform tra_CurrFly;  //星际迷航特有
+
+//    public GameObject changeTurretList;
+
+
+//    public Action<TurretState> OnStateChange;
+
+//    public void ChangeState(TurretState state)
+//    {
+//        OnStateChange?.Invoke(state);
+//    }
+
+//    public void Awake()
+//    {
+//        //list_Turrets.Sort((td1,td2) =>
+//        //{
+//        //    return td1.turretID.CompareTo(td2.turretLevel);
+//        //});
+//        dic_Turrets = list_Turrets.ToDictionary(td => td.turretID);
+//        btn_TurretAdd.onClick.AddListener(() =>
+//        {
+//            ChangeTurretAddConsumeNum(1000);
+//        });
+//        btn_TurretMinus.onClick.AddListener(() =>
+//        {
+//            ChangeTurretMinusConsumeNum(1000);
+
+//        });
+//    }
+//    public void Update()
+//    {
+
+//    }
+//    public void ChangeTurret(int n=0)
+//    {
+
+//        if (currentTurretIndex>list_Turrets.Count|| currentTurretIndex<0)
+//        {
+//            //currentTurretIndex = currentTurretIndex;
+//        }
+//        else
+//        {
+//            currentTurretIndex = n;
+//        }
+//        if (currentTurret != null)
+//        {
+//            currentTurret.gameObject.SetActive(false);
+//        }
+
+//        currentTurretID = list_Turrets[currentTurretIndex].turretID; //dic_Turrets[currentTurretID];
+//        currentTurret=dic_Turrets[currentTurretID];
+//        currentTurret.gameObject.SetActive(true);
+//        // ⭐ 关键：把状态机入口绑定到当前炮台
+//        OnStateChange = currentTurret.ChangeState;
+
+//        gameObject.SetActive(true);
+//        tra_CurrTurret =currentTurret.transform.GetChild(0);
+//        tra_CurrFly = currentTurret.transform.GetChild(1);
+
+//    }
+//    public void ChangeTurretConsumeNum(int n = 0)
+//    {
+//        consumeGoldNum = n;
+//        tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
+
+//    }
+//    public void ChangeTurretAddConsumeNum(int n = 0)
+//    {
+//        consumeGoldNum += n;
+//        tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
+
+//    }
+//    public void ChangeTurretMinusConsumeNum(int n = 0)
+//    {
+//        consumeGoldNum -= n;
+//        tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
+
+//    }
+//    public bool ConsumeGold(int bl=1)
+//    {
+//        long temp = goldNum - consumeGoldNum*bl;
+//        if (temp > 0)
+//        {
+//            goldNum = temp;
+//            tMP_GoldNum.text = goldNum.ToString();
+//            return true;
+//        }
+//        return false;
+//    }
+//}
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using TMPro;
-using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;

 public class SitPosData : MonoBehaviour
 {
-    [Header("用户id")]
+    // -------------------------
+    // 玩家信息
+    // -------------------------
    public string user;
-    [Header("座位id")]
    public int posID;
+
    [Header("金币")]
+    public long goldNum;
+    public long consumeGoldNum;
    public TextMeshProUGUI tMP_TurretConsumeNum;
    public TextMeshProUGUI tMP_GoldNum;

-    public Button btn_TurretAdd;
-    public Button btn_TurretMinus;
-
-    public long goldNum;
-    public long consumeGoldNum;
-    [Header("炮台")]
-    public Dictionary<string, TurretData> dic_Turrets=new Dictionary<string, TurretData>();
-    public List<TurretData> list_Turrets=new List<TurretData>();
+    // -------------------------
+    // 炮台管理
+    // -------------------------
+    public List<TurretData> list_Turrets = new List<TurretData>();
+    public Dictionary<string, TurretData> dic_Turrets = new Dictionary<string, TurretData>();
    public int currentTurretIndex = 0;
-    public string currentTurretID = "";
    public TurretData currentTurret;
-    [Header("锁定")]
+
+    // 状态机入口（GameMainPanel 调用）
+    public Action<TurretState> OnStateChange;
+
+    // -------------------------
+    // 炮台旋转
+    // -------------------------
+    public Transform tra_CurrTurret;
+    public float currentAngle;
+
+    // -------------------------
+    // 锁定系统
+    // -------------------------
    public MonsterContral monCotl_Lock;
    public Transform monCotl_Lock_Position;
-    public bool isLock=false;
+    public bool isLock;
    public GameObject lockFX;

-    [Header("当前炮塔")]
-    public SkeletonGraphic skeletonAnimation;
-    public Animation old_CurrAnimation;
-    public Transform tra_CurrTurret;
-    public Transform tra_CurrFly;  //星际迷航特有
-
+    // -------------------------
+    // UI
+    // -------------------------
+    public Button btn_TurretAdd;
+    public Button btn_TurretMinus;
    public GameObject changeTurretList;

-    public void Awake()
+    private void Awake()
    {
-        //list_Turrets.Sort((td1,td2) =>
-        //{
-        //    return td1.turretID.CompareTo(td2.turretLevel);
-        //});
-        dic_Turrets = list_Turrets.ToDictionary(td => td.turretID);
-        btn_TurretAdd.onClick.AddListener(() =>
-        {
-            ChangeTurretAddConsumeNum(1000);
-        });
-        btn_TurretMinus.onClick.AddListener(() =>
-        {
-            ChangeTurretMinusConsumeNum(1000);
+        dic_Turrets = list_Turrets.ToDictionary(t => t.turretID);

-        });
+        btn_TurretAdd.onClick.AddListener(() => ChangeTurretAddConsumeNum(1000));
+        btn_TurretMinus.onClick.AddListener(() => ChangeTurretMinusConsumeNum(1000));
    }
-    public void Update()
+
+    // -------------------------
+    // 切换炮台
+    // -------------------------
+    public void ChangeTurret(int index)
    {
-        
-    }
-    public void ChangeTurret(int n=0)
-    {
-        
-        if (currentTurretIndex>list_Turrets.Count|| currentTurretIndex<0)
-        {
-            //currentTurretIndex = currentTurretIndex;
-        }
-        else
-        {
-            currentTurretIndex = n;
-        }
        if (currentTurret != null)
-        {
            currentTurret.gameObject.SetActive(false);
-        }
-        
-        currentTurretID = list_Turrets[currentTurretIndex].turretID; //dic_Turrets[currentTurretID];
-        currentTurret=dic_Turrets[currentTurretID];
+
+        currentTurretIndex = Mathf.Clamp(index, 0, list_Turrets.Count - 1);
+        currentTurret = list_Turrets[currentTurretIndex];
        currentTurret.gameObject.SetActive(true);

+        // 绑定状态机入口
+        OnStateChange = currentTurret.ChangeState;

-        gameObject.SetActive(true);
-        tra_CurrTurret =currentTurret.transform.GetChild(0);
-        tra_CurrFly = currentTurret.transform.GetChild(1);
-        skeletonAnimation = currentTurret.obj_Animation.GetComponent<SkeletonGraphic>();
-        old_CurrAnimation = currentTurret.obj_Animation.GetComponent<Animation>();
-
+        // 缓存旋转点
+        tra_CurrTurret = currentTurret.transform.GetChild(0);
    }
-    public void ChangeTurretConsumeNum(int n = 0)
+
+    // -------------------------
+    // 切换状态（GameMainPanel 调用）
+    // -------------------------
+    public void ChangeState(TurretState state)
    {
-        consumeGoldNum = n;
-        tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
-
+        OnStateChange?.Invoke(state);
    }
-    public void ChangeTurretAddConsumeNum(int n = 0)
+
+    // -------------------------
+    // 炮台旋转
+    // -------------------------
+    public void SetRotation(float angle)
+    {
+        currentAngle = angle;
+        tra_CurrTurret.rotation = Quaternion.Euler(0, 0, angle);
+    }
+
+    // -------------------------
+    // 获取发射点（给 GameMainPanel）
+    // -------------------------
+    public Vector2 GetBulletStartPos()
+    {
+        return currentTurret.GetBulletStartWorldPos();
+    }
+
+    // -------------------------
+    // 金币消耗
+    // -------------------------
+    public bool ConsumeGold(int mul = 1)
+    {
+        long temp = goldNum - consumeGoldNum * mul;
+        if (temp < 0) return false;
+
+        goldNum = temp;
+        tMP_GoldNum.text = goldNum.ToString();
+        return true;
+    }
+
+    public void ChangeTurretAddConsumeNum(int n)
    {
        consumeGoldNum += n;
        tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
-
    }
-    public void ChangeTurretMinusConsumeNum(int n = 0)
+
+    public void ChangeTurretMinusConsumeNum(int n)
    {
        consumeGoldNum -= n;
        tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
-
-    }
-    public bool ConsumeGold(int bl=1)
-    {
-        long temp = goldNum - consumeGoldNum*bl;
-        if (temp > 0)
-        {
-            goldNum = temp;
-            tMP_GoldNum.text = goldNum.ToString();
-            return true;
-        }
-        return false;
    }
 }
@@ -1,32 +1,180 @@
 using Spine.Unity;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.UI;
+
+public enum TurretAnimType
+{
+    None = 0,
+    skeletonAnimation = 1,
+    animation = 2,
+    animator = 3
+}
+
+public enum TurretState
+{
+    None = 0,
+    Idle = 1,
+    Attack = 2,
+
+    LaserStart = 3,
+    LaserLoop = 4,
+    LaserEnd = 5
+}

 public class TurretData : MonoBehaviour
 {
+    [Header("基础")]
    public string turretID;
-    public int turretLevel;
    public SitPosData setPosData;
-    public Button btn_AddTurretNum;
-    public Button btn_SubTractTurretNum;
-
-    public GameObject bulletPrefab;
-    public GameObject bulletPrefab_Two;
    public Transform tra_BulletStartPosition;
-    public GameObject obj_Animation;
-    public string startTurret;
-    public void OnEnable()
+
+    [Header("动画组件")]
+    public SkeletonGraphic skeletonAnimation;
+    public Animation old_CurrAnimation;
+    public Animator new_CurrAnimation;
+    public TurretAnimType currTurretType;
+    public bool isFrenzy=false;
+
+
+    [Header("动画名")]
+    public string idleAnim;
+    public string attackAnim;
+
+    public string laserStartAnim;
+    public string laserLoopAnim;
+    public string laserEndAnim;
+
+    private TurretState currState;
+
+    private void Awake()
    {
-        foreach (var item in GetComponentsInChildren<SkeletonGraphic>())
+        if (setPosData != null)
+            setPosData.OnStateChange = ChangeState;
+    }
+
+    private void OnEnable()
+    {
+        PlayState(TurretState.Idle);
+    }
+    public Vector2 GetBulletStartWorldPos()
+    {
+        if (tra_BulletStartPosition == null)
+            return Vector2.zero;
+
+        // 如果是 UI RectTransform（UGUI）
+        RectTransform rect = tra_BulletStartPosition.GetComponent<RectTransform>();
+        if (rect != null)
        {
-            if (item.gameObject.activeSelf)
-            {
-                item.AnimationState.SetAnimation(0, startTurret, false);
-            }
-            
+            // 1. UI 本地坐标 → Canvas 坐标
+            Vector2 canvasPos = CoordinateTransformation.AnchoredPos_ToCanvas(
+                rect,
+                UIManager.Instance.uiRoot.GetComponent<Canvas>()
+            );
+
+            // 2. Canvas 坐标 → 世界坐标
+            return CoordinateTransformation.CanvasToWorld(
+                canvasPos,
+                UIManager.Instance.uiRoot.GetComponent<RectTransform>(),
+                Camera.main
+            );
+        }
+
+        // 如果不是 UI（比如 3D Transform）
+        return tra_BulletStartPosition.position;
+    }
+
+    public void SetFrenzy(bool value)
+    {
+        isFrenzy = value;
+
+        if (skeletonAnimation != null)
+            skeletonAnimation.timeScale = isFrenzy ? 2f : 1f;
+
+        if (new_CurrAnimation != null)
+            new_CurrAnimation.speed = isFrenzy ? 2f : 1f;
+
+        if (old_CurrAnimation != null)
+        {
+            foreach (AnimationState state in old_CurrAnimation)
+                state.speed = isFrenzy ? 2f : 1f;
        }
    }

+    public void ChangeState(TurretState newState)
+    {
+        if (currState == newState) return;
+
+        currState = newState;
+        PlayState(newState);
+    }
+
+    private void PlayState(TurretState state)
+    {
+        switch (currTurretType)
+        {
+            case TurretAnimType.skeletonAnimation:
+                PlaySkeleton(state);
+                break;
+
+            case TurretAnimType.animation:
+                PlayLegacy(state);
+                break;
+
+            case TurretAnimType.animator:
+                PlayAnimator(state);
+                break;
+        }
+    }
+
+    private void PlaySkeleton(TurretState state)
+    {
+        if (skeletonAnimation == null) return;
+
+        string anim = state switch
+        {
+            TurretState.Idle => idleAnim,
+            TurretState.Attack => attackAnim,
+
+            TurretState.LaserStart => laserStartAnim,
+            TurretState.LaserLoop => laserLoopAnim,
+            TurretState.LaserEnd => laserEndAnim,
+
+            _ => idleAnim
+        };
+
+        bool loop = state == TurretState.Attack || state == TurretState.LaserLoop;
+
+        skeletonAnimation.AnimationState.SetAnimation(0, anim, loop);
+
+        // 激光开始 → 自动进入 Loop
+        if (state == TurretState.LaserStart)
+        {
+            skeletonAnimation.AnimationState.AddAnimation(0, laserLoopAnim, true, 0f);
+        }
+    }
+
+    private void PlayLegacy(TurretState state)
+    {
+        if (old_CurrAnimation == null) return;
+
+        string anim = state switch
+        {
+            TurretState.Idle => idleAnim,
+            TurretState.Attack => attackAnim,
+
+            TurretState.LaserStart => laserStartAnim,
+            TurretState.LaserLoop => laserLoopAnim,
+            TurretState.LaserEnd => laserEndAnim,
+
+            _ => idleAnim
+        };
+
+        old_CurrAnimation.Play(anim);
+    }
+
+    private void PlayAnimator(TurretState state)
+    {
+        if (new_CurrAnimation == null) return;
+
+        new_CurrAnimation.SetInteger("State", (int)state);
+    }
 }
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ZhanShenTurret : TurretData
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 77cc7a80613454948b89c32d4269f8c9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -75,127 +75,6 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!1 &253289911384601165
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7362718401641258334}
-  - component: {fileID: 7097402667572873863}
-  - component: {fileID: 6321583642151273616}
-  - component: {fileID: 5398992926565514206}
-  m_Layer: 5
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &7362718401641258334
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 253289911384601165}
-  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: 1872278266719823235}
-  m_Father: {fileID: 2713217087351076567}
-  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: -326, y: 761.75}
-  m_SizeDelta: {x: 160, y: 56.5}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7097402667572873863
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 253289911384601165}
-  m_CullTransparentMesh: 1
--- !u!114 &6321583642151273616
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 253289911384601165}
-  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!114 &5398992926565514206
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 253289911384601165}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 6321583642151273616}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &290480904548352089
 GameObject:
  m_ObjectHideFlags: 0
@@ -271,6 +150,126 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &451279130178473817
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4852173693812700946}
+  - component: {fileID: 6697891122463245245}
+  - component: {fileID: 6529657534113802056}
+  - component: {fileID: 4683566954994342685}
+  m_Layer: 0
+  m_Name: an_gz
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4852173693812700946
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 451279130178473817}
+  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: 2713217087351076567}
+  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: 269.99997, y: 728}
+  m_SizeDelta: {x: 80, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6697891122463245245
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 451279130178473817}
+  m_CullTransparentMesh: 1
+--- !u!114 &6529657534113802056
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 451279130178473817}
+  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: 4c7d5f7c02c57584fb6c74ee78187c16, 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 &4683566954994342685
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 451279130178473817}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 6529657534113802056}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &589904294603478924
 GameObject:
  m_ObjectHideFlags: 0
@@ -1844,7 +1843,7 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2735491305906290453}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -1907,7 +1906,9 @@ RectTransform:
  - {fileID: 7885935478483656195}
  - {fileID: 1311275167813292198}
  - {fileID: 2724128015881410653}
-  - {fileID: 7362718401641258334}
+  - {fileID: 3042691846684353951}
+  - {fileID: 551837965639396177}
+  - {fileID: 4852173693812700946}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1967,9 +1968,10 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  panelAddressConfig: {fileID: 11400000, guid: 23b7fda546f00994f81f99b88f11b072, type: 2}
  subPanelParent: {fileID: 2724128015881410653}
+  textMeshProUGUI_RoomID: {fileID: 8718330803947035889}
  btn_QiuHe: {fileID: 2065631752728168651}
  btn_RenShu: {fileID: 4922536534435888871}
-  btn_FanHuiDaTing: {fileID: 5398992926565514206}
+  btn_FanHuiDaTing: {fileID: 8119276241258304471}
  tmp_Name_Bottom: {fileID: 8524192704910942279}
  tmp_CoinCount_Bottom: {fileID: 9063371640914375294}
  img_Title_Bottom: {fileID: 5347314151497148045}
@@ -2203,141 +2205,6 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!1 &3298135714355444121
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1872278266719823235}
-  - component: {fileID: 8602268476289202526}
-  - component: {fileID: 8296895418602300790}
-  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 &1872278266719823235
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3298135714355444121}
-  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: 7362718401641258334}
-  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 &8602268476289202526
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3298135714355444121}
-  m_CullTransparentMesh: 1
--- !u!114 &8296895418602300790
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3298135714355444121}
-  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: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: "\u8FD4\u56DE\u5927\u5385"
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
-  m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
-    type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4281479730
-  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 39
-  m_fontSizeBase: 24
-  m_fontWeight: 400
-  m_enableAutoSizing: 1
-  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 &3473166186098203566
 GameObject:
  m_ObjectHideFlags: 0
@@ -2413,6 +2280,141 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3533895123476321566
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3042691846684353951}
+  - component: {fileID: 8980936191622789389}
+  - component: {fileID: 8718330803947035889}
+  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 &3042691846684353951
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3533895123476321566}
+  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: 2713217087351076567}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -148}
+  m_SizeDelta: {x: 200, y: 57}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8980936191622789389
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3533895123476321566}
+  m_CullTransparentMesh: 1
+--- !u!114 &8718330803947035889
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3533895123476321566}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: New Text
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
+  m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
+    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: 39.35
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  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: 0
+  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 &3609136261755428917
 GameObject:
  m_ObjectHideFlags: 0
@@ -5463,6 +5465,126 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8583195937032860197
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 551837965639396177}
+  - component: {fileID: 2422034348675792676}
+  - component: {fileID: 1827288161209625791}
+  - component: {fileID: 8119276241258304471}
+  m_Layer: 0
+  m_Name: an_fh
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &551837965639396177
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8583195937032860197}
+  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: 2713217087351076567}
+  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: -287.5, y: 725}
+  m_SizeDelta: {x: 92, y: 96}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2422034348675792676
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8583195937032860197}
+  m_CullTransparentMesh: 1
+--- !u!114 &1827288161209625791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8583195937032860197}
+  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: 9f9eefbf33d82424c95cdbecbd6f5f6b, 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 &8119276241258304471
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8583195937032860197}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1827288161209625791}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8731578906999063752
 GameObject:
  m_ObjectHideFlags: 0
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &1320379012505120652
+--- !u!1 &210691374766920002
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -8,50 +8,50 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 5265666223566239695}
-  - component: {fileID: 2038545151414882761}
-  - component: {fileID: 7660849963534271161}
-  m_Layer: 5
-  m_Name: "\u77E9\u5F62 1 \u62F7\u8D1D 15"
+  - component: {fileID: 2240950519350826105}
+  - component: {fileID: 4007590051038754011}
+  - component: {fileID: 4712110434791232240}
+  m_Layer: 0
+  m_Name: JianJie
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &5265666223566239695
+--- !u!224 &2240950519350826105
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1320379012505120652}
+  m_GameObject: {fileID: 210691374766920002}
  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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
+  m_ConstrainProportionsScale: 1
  m_Children: []
-  m_Father: {fileID: 1674293675286065827}
+  m_Father: {fileID: 3700906181494595843}
  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: 5.5}
-  m_SizeDelta: {x: 558, y: 813}
+  m_AnchoredPosition: {x: 0, y: 33}
+  m_SizeDelta: {x: 500, y: 760}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2038545151414882761
+--- !u!222 &4007590051038754011
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1320379012505120652}
+  m_GameObject: {fileID: 210691374766920002}
  m_CullTransparentMesh: 1
--- !u!114 &7660849963534271161
+--- !u!114 &4712110434791232240
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1320379012505120652}
+  m_GameObject: {fileID: 210691374766920002}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -65,7 +65,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7150156c99940d34d81bbf892c0e4e6e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c682f25834203af4ba4e1e09b23c9583, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -85,7 +85,6 @@ GameObject:
  m_Component:
  - component: {fileID: 1674293675286065827}
  - component: {fileID: 7524099388833687109}
-  - component: {fileID: 7758181686418796575}
  - component: {fileID: 4331143533019612861}
  m_Layer: 5
  m_Name: Introduce
@@ -101,18 +100,12 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1832010687767733626}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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: 7815477592094301423}
-  - {fileID: 5265666223566239695}
-  - {fileID: 488769302390635773}
-  - {fileID: 5529028495749696680}
-  - {fileID: 2495100406807813278}
-  - {fileID: 5189496250692331672}
-  - {fileID: 1689387502364652951}
+  - {fileID: 3700906181494595843}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@@ -128,36 +121,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1832010687767733626}
  m_CullTransparentMesh: 1
--- !u!114 &7758181686418796575
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1832010687767733626}
-  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.5882353}
-  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: 082cae1e68ee03748bc0ff5b4c98e0db, 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 &4331143533019612861
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -170,8 +133,9 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 3301970b3e9d7994db808a9629542f4a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  btn_Close: {fileID: 1144912961652140370}
--- !u!1 &2233656110138187697
+  btn_Close: {fileID: 6137527249269082608}
+  uIEffect: 1
+--- !u!1 &3414222547991336709
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -179,50 +143,52 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 7815477592094301423}
-  - component: {fileID: 6377191017750384263}
-  - component: {fileID: 54641176453779983}
-  m_Layer: 5
-  m_Name: "\u77E9\u5F62 1 \u62F7\u8D1D"
+  - component: {fileID: 3700906181494595843}
+  - component: {fileID: 8521454783625225992}
+  - component: {fileID: 8255495227071340035}
+  m_Layer: 0
+  m_Name: JianJie
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &7815477592094301423
+--- !u!224 &3700906181494595843
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2233656110138187697}
+  m_GameObject: {fileID: 3414222547991336709}
  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_Children:
+  - {fileID: 2240950519350826105}
+  - {fileID: 4901677113738917951}
  m_Father: {fileID: 1674293675286065827}
  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.5}
-  m_SizeDelta: {x: 582, y: 833}
+  m_AnchoredPosition: {x: -1, y: 21.5}
+  m_SizeDelta: {x: 673, y: 1028}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6377191017750384263
+--- !u!222 &8521454783625225992
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2233656110138187697}
+  m_GameObject: {fileID: 3414222547991336709}
  m_CullTransparentMesh: 1
--- !u!114 &54641176453779983
+--- !u!114 &8255495227071340035
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2233656110138187697}
+  m_GameObject: {fileID: 3414222547991336709}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -236,7 +202,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b71d1fd4f3530064181aa9489ac08045, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3433c18cbfed9594393a7ea9c5cdea46, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -246,7 +212,7 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!1 &2640629889253798066
+--- !u!1 &6444397726565008716
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -254,50 +220,51 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 5529028495749696680}
-  - component: {fileID: 9057185594797702315}
-  - component: {fileID: 3345213639064143485}
-  m_Layer: 5
-  m_Name: "\u77E9\u5F62 1 \u62F7\u8D1D 12"
+  - component: {fileID: 4901677113738917951}
+  - component: {fileID: 4689370924021225225}
+  - component: {fileID: 7254772022433152029}
+  - component: {fileID: 6137527249269082608}
+  m_Layer: 0
+  m_Name: btn_close
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &5529028495749696680
+--- !u!224 &4901677113738917951
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2640629889253798066}
+  m_GameObject: {fileID: 6444397726565008716}
  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: 1674293675286065827}
+  m_Father: {fileID: 3700906181494595843}
  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: 449}
-  m_SizeDelta: {x: 250, y: 52}
+  m_AnchoredPosition: {x: 280, y: 476}
+  m_SizeDelta: {x: 88, y: 90}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9057185594797702315
+--- !u!222 &4689370924021225225
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2640629889253798066}
+  m_GameObject: {fileID: 6444397726565008716}
  m_CullTransparentMesh: 1
--- !u!114 &3345213639064143485
+--- !u!114 &7254772022433152029
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2640629889253798066}
+  m_GameObject: {fileID: 6444397726565008716}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -311,7 +278,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b7609b5a265aebb41950206b8a3f18d8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9854838f1f5c23744bc42fa544b24263, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -321,316 +288,13 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!1 &4391749317732797810
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 488769302390635773}
-  - component: {fileID: 8053918010164625365}
-  - component: {fileID: 8673393779651895890}
-  m_Layer: 5
-  m_Name: "\u77E9\u5F62 1 \u62F7\u8D1D 9"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &488769302390635773
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4391749317732797810}
-  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: 1674293675286065827}
-  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: 443.99988}
-  m_SizeDelta: {x: 652, y: 80}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8053918010164625365
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4391749317732797810}
-  m_CullTransparentMesh: 1
--- !u!114 &8673393779651895890
+--- !u!114 &6137527249269082608
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4391749317732797810}
-  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: 72cc044573a179e4cb30ba72b912e64f, 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 &4751741469703879059
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5189496250692331672}
-  - component: {fileID: 296566928405156541}
-  - component: {fileID: 4397656839782746760}
-  m_Layer: 5
-  m_Name: "-h-\u8C61\u68CB\u4ECB\u7ECD"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &5189496250692331672
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4751741469703879059}
-  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: 1674293675286065827}
-  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: 449}
-  m_SizeDelta: {x: 130, y: 32}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &296566928405156541
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4751741469703879059}
-  m_CullTransparentMesh: 1
--- !u!114 &4397656839782746760
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4751741469703879059}
-  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: 31985536333a24241865bb855dd4c71f, 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 &5748629533485336493
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2495100406807813278}
-  - component: {fileID: 4965079217901469152}
-  - component: {fileID: 4158496770577865667}
-  m_Layer: 5
-  m_Name: "-h-          \u8C61\u68CB\u662F\u4E2D\u56FD\u4E00\u79CD\u6D41\u4F20\u5341\u5206\u5E7F\u6CDB\u7684\u6E38\u620F\u3002
-    \u4E0B\u68CB\u53CC\u65B9\u6839\u636E\u81EA\u5DF1\u5BF9\u68CB\u5C40\u5F62\u5F0F\u7684\u7406\u89E3\u548C\u5BF9
-    \u68CB\u827A\u89C4\u5F8B\u7684\u638C\u63E1\uFF0C\u8C03\u52A8\u8F66\u9A6C\uFF0C\u7EC4\u7EC7\u5175"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &2495100406807813278
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5748629533485336493}
-  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: 1674293675286065827}
-  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: 8.5}
-  m_SizeDelta: {x: 486, y: 695}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4965079217901469152
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5748629533485336493}
-  m_CullTransparentMesh: 1
--- !u!114 &4158496770577865667
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5748629533485336493}
-  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: a9403c5ce50304240b5df58e331a96e6, 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 &8922839296346115309
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1689387502364652951}
-  - component: {fileID: 6320981854061617599}
-  - component: {fileID: 226996466416543915}
-  - component: {fileID: 1144912961652140370}
-  m_Layer: 5
-  m_Name: -h-x
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1689387502364652951
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8922839296346115309}
-  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: 1674293675286065827}
-  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: 287, y: 447.49988}
-  m_SizeDelta: {x: 38, y: 33}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6320981854061617599
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8922839296346115309}
-  m_CullTransparentMesh: 1
--- !u!114 &226996466416543915
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8922839296346115309}
-  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: 0517d942c5287d34c81ec7f7b1cffdad, 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 &1144912961652140370
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8922839296346115309}
+  m_GameObject: {fileID: 6444397726565008716}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@@ -664,7 +328,7 @@ MonoBehaviour:
    m_SelectedTrigger: Selected
    m_DisabledTrigger: Disabled
  m_Interactable: 1
-  m_TargetGraphic: {fileID: 226996466416543915}
+  m_TargetGraphic: {fileID: 7254772022433152029}
  m_OnClick:
    m_PersistentCalls:
      m_Calls: []
@@ -1,13 +1,18 @@
 using Assets.MyGame.Scripts.Net.WebResponses.ChineseChess;
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;

 public class UIChineseChessCreateRoom : SubUIBase
 {
-    public Button btn_CreateRoom_Hei;
-    public Button btn_CreateRoom_Red;
+    public Button btn_CreateRoom;
+    public Button btn_CopyPassword;
+    public Toggle toggle_Red;
+    public Toggle toggle_Black;
+    public TMP_InputField tMPInput_Password;
+    int gameType=1;
    // Start is called before the first frame update
    public override void Awake()
    {
@@ -19,7 +24,29 @@ public class UIChineseChessCreateRoom : SubUIBase
        //        gameType=1,
        //    });
        //});
-       
+        btn_CopyPassword.onClick.AddListener(() =>
+        {
+            ClipboardUtility.SetText(tMPInput_Password.text);
+        });
+        toggle_Black.onValueChanged.AddListener((a) =>
+        {
+            gameType = 1;
+        });
+        toggle_Red.onValueChanged.AddListener((a) =>
+        {
+            gameType = 2;
+        });
+        tMPInput_Password.onValueChanged.AddListener((a) =>
+        {
+            if (a[a.Length-1]>57|| a[a.Length - 1]<48)
+            {
+                tMPInput_Password.text = a.Substring(0,a.Length - 1);
+            }
+            if (a.Length>6)
+            {
+                tMPInput_Password.text=a.Substring(0,6);
+            }
+        });

    }
    protected override void OnShow(object args = null)
@@ -28,30 +55,26 @@ public class UIChineseChessCreateRoom : SubUIBase
        if (args != null)
        {
            var v = (ChineseChessGameClassList.ChessGameRoom)args;
-            btn_CreateRoom_Hei.onClick.RemoveAllListeners();
-            btn_CreateRoom_Red.onClick.RemoveAllListeners();
+            btn_CreateRoom.onClick.RemoveAllListeners();

-            btn_CreateRoom_Hei.onClick.AddListener(() =>
+            btn_CreateRoom.onClick.AddListener(() =>
            {
-                WebSocketSendList.CreateRoomChineseChess(new Assets.MyGame.Scripts.Net.WebResponses.ChineseChess.ChineseChessGameClassList.CreateRoomParam
+                if (tMPInput_Password.text.Length==6)
                {
-                    gameType = 1,
-                    gold = 1000,
-                    password = "123456",
-                    roomId=v.roomId,
-                    userId= GameManager.Instance.user.id
-                });
-            });
-            btn_CreateRoom_Red.onClick.AddListener(() =>
-            {
-                WebSocketSendList.CreateRoomChineseChess(new Assets.MyGame.Scripts.Net.WebResponses.ChineseChess.ChineseChessGameClassList.CreateRoomParam
+                    WebSocketSendList.CreateRoomChineseChess(new Assets.MyGame.Scripts.Net.WebResponses.ChineseChess.ChineseChessGameClassList.CreateRoomParam
+                    {
+                        gameType = gameType,
+                        gold = 1000,
+                        password = tMPInput_Password.text,
+                        roomId = v.roomId,
+                        userId = GameManager.Instance.user.id
+                    });
+                }
+                else
                {
-                    gameType = 2,
-                    gold = 1000,
-                    password = "123456",
-                    roomId = v.roomId,
-                    userId = GameManager.Instance.user.id
-                });
+                    UIManager.Instance.ShowBoardError("密码格式不正确");
+                }
+                
            });
        }
       
@@ -19,11 +19,12 @@ public class UIChineseChessDistrict : SubUIBase
    
    public override void Awake()
    {
-        btn_Close.onClick.AddListener(() =>
-        {
-            UIManager.Instance.Close(UIPanel.MainGamePanelZGXQ);
-            UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel);
-        });
+        base.Awake();
+        //btn_Close.onClick.AddListener(() =>
+        //{
+        //    UIManager.Instance.Close(UIPanel.MainGamePanelZGXQ);
+        //    UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel);
+        //});



@@ -88,7 +89,7 @@ public class UIChineseChessDistrict : SubUIBase
                tran.name = item.roomId;
                itemListDic.Add(item.roomId, tran);
                ChineseChessMainPanel.dic_RoomData[item.roomId]=(item);
-                var slider = tran.transform.GetChild(1).GetComponent<Slider>();
+                var slider = tran.transform.GetChild(0).GetComponent<Slider>();
                int allPlayerCount = item.users.Count;
                //int allPlayerCount = item.currentOnlinePlayerCount + item.robotCount;
                slider.value = (float)allPlayerCount / 2;
@@ -100,8 +101,8 @@ public class UIChineseChessDistrict : SubUIBase
                {
                    slider.fillRect.GetChild(0).gameObject.SetActive(false);
                }
-                tran.transform.GetChild(2).GetComponent<TextMeshProUGUI>().text = allPlayerCount + "/" + 2;
-                tran.transform.GetChild(3).GetComponent<TextMeshProUGUI>().text = item.roomId.ToString();
+                tran.transform.GetChild(1).GetComponent<TextMeshProUGUI>().text = allPlayerCount + "/" + 2;
+                tran.transform.GetChild(2).GetComponent<TextMeshProUGUI>().text = item.roomId.Split("-")[1].ToString();
                i++;
            }
            scroll.horizontalNormalizedPosition = 0;
@@ -3,23 +3,47 @@ using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
+using UnityEngine.UI;

 public class UIChineseChessJoinRoom : SubUIBase
 {
    public TMP_InputField tMPInput_Password;
+    public Button btn_Notarize;
+    public Button btn_Paste;
+    public override void Awake()
+    {
+        base.Awake();
+        btn_Paste.onClick.AddListener(() =>
+        {
+            tMPInput_Password.text = ClipboardUtility.GetText();
+        });
+    }
    protected override void OnShow(object args = null)
    {
        base.OnShow(args);
+        var v = (ChineseChessGameClassList.ChessGameRoom)args;
+        btn_Notarize.onClick.RemoveAllListeners();
+        
+        btn_Notarize.onClick.AddListener(() =>
+        {
+            if (tMPInput_Password.text.Length == 6)
+            {
+                WebSocketSendList.JoinGameChineseChess(v.roomId, tMPInput_Password.text, GameManager.Instance.user.id);
+            }
+            else
+            {
+                UIManager.Instance.ShowBoardError("密码格式错误");
+            }
+        });
        if (args != null)
        {
-            var v = (ChineseChessGameClassList.ChessGameRoom)args;
            tMPInput_Password.text = "";
            tMPInput_Password.onValueChanged.RemoveAllListeners();
            tMPInput_Password.onValueChanged.AddListener((a) =>
            {
-                if (a.Length == 6)
+                if (a.Length > 6)
                {
-                    WebSocketSendList.JoinGameChineseChess(v.roomId,a,GameManager.Instance.user.id);
+                    tMPInput_Password.text = a.Substring(0, 6);
                }
            });
        }
@@ -4241,7 +4241,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7454869339547118872
 RectTransform:
  m_ObjectHideFlags: 0
@@ -30,8 +30,11 @@ public class GameMainPanel_Base : UIBase
 #if UNITY_EDITOR
    public void OnGUI()
    {
+        if (GameManager.Instance.gameData.currRoomData != null)
+        {
+            textMeshProUGUI_RoomID.text = GameManager.Instance.gameData.currRoomData.roomId;

-        textMeshProUGUI_RoomID.text = GameManager.Instance.gameData.currRoomData.roomId;
+        }
    }
 #endif
 }
@@ -26,6 +26,7 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
    float horizontalNormalizedPosition;
    public override void Awake()
    {
+        
        btn_NextPage.onClick.AddListener(() =>
        {

@@ -50,6 +51,7 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
            Hide();

        });
+
        //panel_RoomItemPrefab.onClick.AddListener(() =>
        //{
        //    GameManager.Instance.StartGame();
@@ -73,7 +75,7 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
        }
        itemPage.Clear();
        text_PageNum.text = pageNum + "/" + itemPage.Count;
-        panel_PanelParent.SetActive(false);
+        //panel_PanelParent.SetActive(false);
        if (args != null)
        {
            int i = 0;
@@ -137932,7 +137932,7 @@ Material:
    - _MaskSoftnessY: 0
    - _Metallic: 0
    - _OcclusionStrength: 1
-    - _OutlineSoftness: 0
+    - _OutlineSoftness: 0.192
    - _OutlineUVSpeedX: 0
    - _OutlineUVSpeedY: 0
    - _OutlineWidth: 0