diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 62b7ab554..c10abaee0 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -92,6 +92,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 7fc72821c53ff6a40b70a711c3d091c6 + m_Address: Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.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 diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab index e6184cae8..612721328 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab @@ -121,7 +121,7 @@ MonoBehaviour: materialsInsideMask: [] materialsOutsideMask: [] disableRenderingOnOverride: 1 - _animationName: + _animationName: stand loop: 0 timeScale: 1 --- !u!1 &1267104346094772 diff --git a/Assets/Framework/Event/ConstEventString.cs b/Assets/Framework/Event/ConstEventString.cs new file mode 100644 index 000000000..210407291 --- /dev/null +++ b/Assets/Framework/Event/ConstEventString.cs @@ -0,0 +1,9 @@ + +public class ConstEventString +{ + public const string SyncGameData_Rotate = "SyncGameData_Rotate"; + public const string SyncGameData_FireBullet = "SyncGameData_FireBullet"; + public const string SyncGameData_CreateFish = "SyncGameData_CreateFish"; + public const string SyncGameData_ChangeTargetMonster = "SyncGameData_ChangeTargetMonster"; +} + diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProduct.cs.meta b/Assets/Framework/Event/ConstEventString.cs.meta similarity index 83% rename from Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProduct.cs.meta rename to Assets/Framework/Event/ConstEventString.cs.meta index 18c2e4e25..cc85c8bf8 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProduct.cs.meta +++ b/Assets/Framework/Event/ConstEventString.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 47c523ec9828ed64495bd3c41a15f9ff +guid: 2a12b4d76c42f8d49b6af72e52653bb3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Framework/Tool/BeijingTimeManager.cs b/Assets/Framework/Tool/BeijingTimeManager.cs new file mode 100644 index 000000000..6ec7fa643 --- /dev/null +++ b/Assets/Framework/Tool/BeijingTimeManager.cs @@ -0,0 +1,149 @@ +using System; +using UnityEngine; +using System.Collections; + +/// +/// 北京时间管理器 - 获取一次后持续自增 +/// +public class BeijingTimeManager : MonoSingleton +{ + [Header("时间状态")] + [SerializeField] private bool _isTimeSynced = false; // 是否已同步 + [SerializeField] private DateTime _currentBeijingTime; // 当前北京时间 + [SerializeField] private float _timeSinceLastSync; // 距离上次同步的秒数 + + // 公开属性供其他脚本访问 + public DateTime CurrentBeijingTime + { + get + { + if (_isTimeSynced) + { + // 基准时间 + 流逝的时间 + return _currentBeijingTime.AddSeconds(_timeSinceLastSync); + } + else + { + Debug.LogWarning("时间尚未同步，返回本地时间"); + return DateTime.Now.AddHours(8); // 降级为本地时间+8小时 + } + } + } + + public bool IsTimeSynced => _isTimeSynced; + + // 事件：当时间成功同步时触发 + public event Action OnTimeSynced; + private void Start() + { + SyncBeijingTime(); + } + private void Update() + { + if (_isTimeSynced) + { + // 持续累计时间 + _timeSinceLastSync += Time.deltaTime; + + // 可选：每隔一段时间（如5分钟）自动校准 + if (_timeSinceLastSync > 300f) // 5分钟 + { + StartCoroutine(AutoCalibrateTime()); + } + } + } + + /// + /// 手动触发时间同步 + /// + public void SyncBeijingTime() + { + StartCoroutine(FetchBeijingTime()); + } + + /// + /// 获取北京时间（协程） + /// + private IEnumerator FetchBeijingTime() + { + string[] timeServers = new string[] + { + "http://www.beijing-time.org/time.asp", + "https://www.baidu.com", + "https://www.taobao.com", + + }; + + DateTime beijingTime = DateTime.MinValue; + bool success = false; + + foreach (string url in timeServers) + { + using (UnityEngine.Networking.UnityWebRequest request = + UnityEngine.Networking.UnityWebRequest.Get(url)) + { + yield return request.SendWebRequest(); + + if (request.result == UnityEngine.Networking.UnityWebRequest.Result.Success) + { + string dateHeader = request.GetResponseHeader("Date"); + if (!string.IsNullOrEmpty(dateHeader)) + { + try + { + // 解析GMT时间 + DateTime gmtTime = DateTime.ParseExact(dateHeader, + "ddd, dd MMM yyyy HH:mm:ss 'GMT'", + System.Globalization.CultureInfo.InvariantCulture, + System.Globalization.DateTimeStyles.AssumeUniversal); + + beijingTime = gmtTime.AddHours(8); + + // 更新基准时间和计时器 + _currentBeijingTime = beijingTime; + _timeSinceLastSync = 0f; + _isTimeSynced = true; + + Debug.Log($"时间同步成功！北京时间：{beijingTime:yyyy-MM-dd HH:mm:ss}"); + + // 触发事件 + OnTimeSynced?.Invoke(beijingTime); + + success = true; + break; + } + catch (Exception e) + { + Debug.LogWarning($"解析失败：{e.Message}"); + continue; + } + } + } + } + } + + if (!success) + { + Debug.LogError("所有时间服务器都失败了，使用本地时间作为备用"); + _currentBeijingTime = DateTime.Now.AddHours(8); + _timeSinceLastSync = 0f; + _isTimeSynced = false; // 标记为未同步 + } + } + + /// + /// 自动校准（后台静默同步） + /// + private IEnumerator AutoCalibrateTime() + { + Debug.Log("开始自动校准时间..."); + + // 保存当前累计时间，用于计算校准时的差距 + float oldElapsed = _timeSinceLastSync; + + yield return StartCoroutine(FetchBeijingTime()); + + // 校准后可以计算误差 + Debug.Log($"时间校准完成，误差：{_timeSinceLastSync - oldElapsed:F2}秒"); + } +} \ No newline at end of file diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProductCount.cs.meta b/Assets/Framework/Tool/BeijingTimeManager.cs.meta similarity index 83% rename from Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProductCount.cs.meta rename to Assets/Framework/Tool/BeijingTimeManager.cs.meta index 38b29ae4d..ee8670339 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProductCount.cs.meta +++ b/Assets/Framework/Tool/BeijingTimeManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f237c5f1b35d6d44945e826e61cdf7f +guid: eb493f215fdb45f4e87ada719286af2a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 3e7920da7..092a4bff8 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -911,6 +911,7 @@ GameObject: - component: {fileID: 2075409199} - component: {fileID: 2075409200} - component: {fileID: 2075409201} + - component: {fileID: 2075409202} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -1108,6 +1109,7 @@ MonoBehaviour: dieFXPrefab: {fileID: 6304718870697136037, guid: 81d9913b840dd1e4d9801e06ed16d14e, type: 3} fishRoot: {fileID: 0} + fangzhu: 0 --- !u!61 &2075409201 BoxCollider2D: m_ObjectHideFlags: 0 @@ -1153,6 +1155,20 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!114 &2075409202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2075409194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb493f215fdb45f4e87ada719286af2a, type: 3} + m_Name: + m_EditorClassIdentifier: + _isTimeSynced: 0 + _timeSinceLastSync: 0 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs index 967154372..e02efa9cb 100644 --- a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs +++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs @@ -11,7 +11,7 @@ using static MonsterMoveLine; public class MonsterContral : MonoBehaviour { - public string hashCode; + public string guid; public MonsterDataBase monsterData = new MonsterDataBase(new MonsterHealthBase()); public SkeletonAnimation skeleton; public bool isSpine = true; diff --git a/Assets/MyGame/Scripts/CreateFishType.cs b/Assets/MyGame/Scripts/CreateFishType.cs index 83bd91265..5e4a5d41d 100644 --- a/Assets/MyGame/Scripts/CreateFishType.cs +++ b/Assets/MyGame/Scripts/CreateFishType.cs @@ -1,4 +1,4 @@ -using Model.Entity.BaseModel; +using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass; using System; using System.Collections.Generic; using System.Linq; @@ -17,17 +17,17 @@ public static class CreateFishType { //dic_CreateFishType.Add(FishCreateType.Line, CreateLine); } - public static void CreateFish(RoomFishDetailConfig roomFishDetailConfig) - { - switch (roomFishDetailConfig.Type) - { - case 0: - break; - case 1: - break; - default: - break; - } - } + //public static void CreateFish(RoomFishDetailConfig roomFishDetailConfig) + //{ + // switch (roomFishDetailConfig.Type) + // { + // case 0: + // break; + // case 1: + // break; + // default: + // break; + // } + //} } diff --git a/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs b/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs index 6601ea34a..bee3e1c3d 100644 --- a/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs +++ b/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs @@ -9,7 +9,7 @@ using UnityEngine; public class BullitMove : MonoBehaviour { - public RoomJoinNotice user; + public UserToken user; public float moveSpeed = 5; public float desTime = 10f; public string playerID; @@ -19,6 +19,7 @@ public class BullitMove : MonoBehaviour Vector3 vector3_startPosition; public bool isTriggerFirst = true; MonsterContral target; + public string bulletID; // Start is called before the first frame update void Awake() { @@ -175,7 +176,7 @@ public class BullitMove : MonoBehaviour var v2 = GameManager.Instance.gameData.currRoomData; if (true) { - WebSocketSendList.KillFish(v2.roomId, user.userId,monster.monsterData.fishTypeConfig.fishNumber, monster.hashCode, GameManager.Instance.gameData.roomJoinNotice.cannonMultiple); + WebSocketSendList.KillFish(v2.roomId, user.id,monster.monsterData.fishTypeConfig.fishNumber, monster.guid, GameManager.Instance.gameData.roomJoinNotice.cannonMultiple); } diff --git a/Assets/MyGame/Scripts/Manager/CreateFishData.cs b/Assets/MyGame/Scripts/Manager/CreateFishData.cs index 3ab7e5c38..dfb4c4c56 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishData.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishData.cs @@ -1,4 +1,4 @@ -using Model.Entity; +using Assets.MyGame.Scripts.Net.API; using UnityEngine; [CreateAssetMenu(fileName = "createassetMenu", menuName = "fishCreate", order = 0)] diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs index 7ff957efa..5bbfaecbe 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs @@ -173,14 +173,23 @@ public class CreateFishManager : MonoSingleton } // CreateSingleFish(); new FishResourcesData(); //这里用来测试加载鱼预制体 + EventCenter.Instance.AddEventListener(ConstEventString.SyncGameData_CreateFish, CreateFish); } + private void OnDestroy() + { + EventCenter.Instance.RemoveEventListener(ConstEventString.SyncGameData_CreateFish, CreateFish); + } + public bool fangzhu; private void Update() { if (spawnList == null) return; - + if (!fangzhu) + { + return; + } var job = new FishSpawnTimerJob { deltaTime = Time.deltaTime, @@ -198,10 +207,35 @@ public class CreateFishManager : MonoSingleton if (shouldSpawn[i] == 1) { var fish = spawnList[i]; - SpawnFishMainThread(fish); + + + { + SyncGameData sgd = new SyncGameData + { + sitPos = GameManager.Instance.gameData.roomJoinNotice.position, + frameType = FrameDataType.createFish, + frameData = new FrameData_CreateFish + { + fish = fish, + } + }; + + WebSocketSendList.SyncGameData(sgd); + } + + + //SpawnFishMainThread(fish); } } } + public void CreateFish(SyncGameData syncGameData) + { + //if (syncGameData.sitPos == GameManager.Instance.gameData.roomJoinNotice.position) + { + var rotateData = JsonConvert.DeserializeObject(syncGameData.frameData.ToString()); + SpawnFishMainThread(rotateData.fish); + } + } private async void SpawnFishMainThread(RoomFishDetailConfig cfg) { @@ -304,8 +338,8 @@ public class CreateFishManager : MonoSingleton var v = fish.GetComponent(); v.monsterData.fishTypeConfig = FishDatas[yz.fishNumber]; - v.hashCode = v.gameObject.GetHashCode().ToString(); - fishDatas_hashCodekey[v.hashCode] = v; + v.guid = Guid.NewGuid().ToString(); + fishDatas_hashCodekey[v.guid] = v; //int pathId = list[Random.Range(0, list.Count)]; v.Init(MonsterMoveLine.dic_BezierCurveDatas["鱼阵" + (pathId)],cfg.times, true, yz.arrayNumber); } @@ -320,8 +354,8 @@ public class CreateFishManager : MonoSingleton GameObject fish = Instantiate(prefab, pos, Quaternion.Euler((360 / count) * i * Vector3.forward), fishRoot); var v = fish.GetComponent(); v.monsterData.fishTypeConfig = FishDatas[yz.fishNumber]; - v.hashCode = v.gameObject.GetHashCode().ToString(); - fishDatas_hashCodekey[v.hashCode] = v; + v.guid = Guid.NewGuid().ToString(); + fishDatas_hashCodekey[v.guid] = v; //int pathId = list[Random.Range(0, list.Count)]; v.Init(MonsterMoveLine.dic_BezierCurveDatas["鱼阵" + (pathId)], cfg.times, true, yz.arrayNumber); } @@ -353,8 +387,8 @@ public class CreateFishManager : MonoSingleton v = fish.AddComponent(); } v.monsterData.fishTypeConfig = FishDatas[yz.fishNumber]; - v.hashCode = v.gameObject.GetHashCode().ToString(); - fishDatas_hashCodekey[v.hashCode] = v; + v.guid = Guid.NewGuid().ToString(); + fishDatas_hashCodekey[v.guid] = v; v.Init(MonsterMoveLine.dic_BezierCurveDatas["鱼阵" + pathId], 10); } @@ -390,8 +424,8 @@ public class CreateFishManager : MonoSingleton v = fish.AddComponent(); } v.monsterData.fishTypeConfig = FishDatas[cfg.fishNumber]; - v.hashCode = v.gameObject.GetHashCode().ToString(); - fishDatas_hashCodekey[v.hashCode] = v; + v.guid = Guid.NewGuid().ToString(); + fishDatas_hashCodekey[v.guid] = v; var list = FishDatas[cfg.fishNumber].pathList; int pathId = list[Random.Range(0, list.Count)]; diff --git a/Assets/MyGame/Scripts/Manager/GameManager.cs b/Assets/MyGame/Scripts/Manager/GameManager.cs index a1d03cdfa..1b84f90a0 100644 --- a/Assets/MyGame/Scripts/Manager/GameManager.cs +++ b/Assets/MyGame/Scripts/Manager/GameManager.cs @@ -1,6 +1,7 @@ using Assets.MyGame.Scripts.Net; using Assets.MyGame.Scripts.Net.API; using Newtonsoft.Json; +using System; using UnityEngine; using UnityEngine.SceneManagement; @@ -8,21 +9,21 @@ public class GameManager : MonoSingleton { public GameConfig gameConfig; public UserToken user; - public GameData gameData=new GameData(); + public GameData gameData = new GameData(); public Scene scene; protected override async void Awake() { Application.runInBackground = true; base.Awake(); - gameData.currUser="123"; + gameData.currUser = "123"; MonsterMoveLine.LoadBezier();//初始化加载路线 //string json = Resources.Load("Config/GameConfig").text; //gameConfig = JsonConvert.DeserializeObject>(json).data; APIManager.Response(APIType.GameConfig_Get, res => { gameConfig = res; var v = CreateFishManager.Instance.CreateDic; }); - } - public void StartGame() + } + public void StartGame(Action action) { switch (gameData.currGameType) @@ -44,8 +45,12 @@ public class GameManager : MonoSingleton break; case GameType.XJMH: - WebSocketManager.Instance.Connect(SocketType.game); - + if (action != null) + { + WebSocketManager.Instance.Connect(SocketType.game, action); + } + else + WebSocketManager.Instance.Connect(SocketType.game); break; case GameType.HHWK: UIManager.Instance.ShowAsync(UIPanel.MainGamePanelDefault); @@ -53,7 +58,7 @@ public class GameManager : MonoSingleton default: break; } - + } // Start is called before the first frame update void Start() @@ -64,7 +69,7 @@ public class GameManager : MonoSingleton // Update is called once per frame void Update() { - + } } diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model.zip b/Assets/MyGame/Scripts/Net/APIResponses/Model.zip new file mode 100644 index 000000000..8fa7b88f2 Binary files /dev/null and b/Assets/MyGame/Scripts/Net/APIResponses/Model.zip differ diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model.zip.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model.zip.meta new file mode 100644 index 000000000..7fcca8fca --- /dev/null +++ b/Assets/MyGame/Scripts/Net/APIResponses/Model.zip.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c36e09f19fea2b84b8427d970cf8a4f2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdCount.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdCount.cs deleted file mode 100644 index 2b3c4a566..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdCount.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Entity.BaseModel -{ - /// - /// 基础ID数量模型类 - /// - - public class BaseIdCount - { - /// - /// Id - /// - public string Id { get; set; } - - /// - /// 数量 - /// - public int Count { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdName.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdName.cs deleted file mode 100644 index a703af4d7..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdName.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Model.Entity.BaseModel -{ - /// - /// 公共对象 ID和Name - /// - - public class BaseIdName - { - /// - /// Id - /// - public string Id { get; set; } - /// - /// 名称 - /// - public string Name { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProduct.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProduct.cs deleted file mode 100644 index c886699dd..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProduct.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Assets.MyGame.Scripts.Net.APIResponses.Enum; - -namespace Model.Entity.BaseModel -{ - /// - /// 基础商品类 - /// - public class BaseProduct - { - /// - /// 产品编号 - /// - public string Number { get; set; } - /// - /// 产品名称 - /// - public string Name { get; set; } - /// - /// 产品描述 - /// - public string Desc { get; set; } - /// - /// 产品图片地址 - /// - public string ImageUrl { get; set; } - - /// - /// 产品类型 - /// - public virtual ProductTypeEnum Type { get; set; } - - /// - /// 道具等级 - /// - public int Level { get; set; } - - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProductCount.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProductCount.cs deleted file mode 100644 index beaee2ffb..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseProductCount.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Model.Entity.BaseModel -{ - /// - /// 产品和数量 - /// - public class BaseProductCount :BaseProduct - { - /// - /// 数量 - /// - public int Count { get; set; } - - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseTitleValue.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseTitleValue.cs deleted file mode 100644 index b4ba69f04..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseTitleValue.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Model.Entity.BaseModel -{ - /// - /// 公共对象 Title和Value - /// - - public class BaseTitleValue - { - /// - /// 标题 - /// - public string Title { get; set; } - /// - /// 名称 - /// - public string Value { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseTitleValue.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseTitleValue.cs.meta deleted file mode 100644 index 7ba9d24ba..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseTitleValue.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ddecf5d674a99dc43bb4a752f1bef662 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/CreateUserInfo.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/CreateUserInfo.cs deleted file mode 100644 index 143f9ecb6..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/CreateUserInfo.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; - -namespace Model.Entity.BaseModel -{ - /// - /// 创建人的信息 - /// - public class CreateInfo - { - - /// - /// 用户id - /// - - public string UserId { get; set; } - /// - /// 用户名称 - /// - - public string UserName { get; set; } - /// - /// 用户头像 - /// - - public string UserHead { get; set; } - /// - /// 用户编号 - /// - public string Number { get; set; } - - /// - /// 创建时间 - /// - - public long CreateTime { get; set; } - - - public CreateInfo() - { - } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/CreateUserInfo.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/CreateUserInfo.cs.meta deleted file mode 100644 index d5359038a..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/CreateUserInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fd5bcc53ae4defa48a4d5d21d3fff6eb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/GameBaseConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/GameBaseConfig.cs deleted file mode 100644 index e95bd9811..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/GameBaseConfig.cs +++ /dev/null @@ -1,537 +0,0 @@ -using Assets.MyGame.Scripts.Net.APIResponses.Enum; -using System.Collections.Generic; - -namespace Model.Entity.BaseModel -{ - /// - /// 鱼种配置表模型类 - /// - public class FishTypeConfig - { - /// - /// 鱼种编号 - /// - public string FishNumber { get; set; } = string.Empty; - - /// - /// 鱼名字 - /// - public string FishName { get; set; } = string.Empty; - - /// - /// 鱼类型 - /// - public FishTypeEnum FishType { get; set; } - - - /// - /// 基础分数 - /// - public int FishScore { get; set; } = 0; - - /// - /// 击杀权重 - /// - public int KillWeight { get; set; } = 0; - - /// - /// 路径编号集合 - /// - - public List PathList { get; set; } = new List(); - } - - /// - /// 房间配置 - /// - public class RoomConfig - { - /// - /// 房间编号 - /// - public string RoomNumber { get; set; }=string.Empty; - - /// - /// 房间名称 - /// - public string RoomName { get; set; } = string.Empty; - - /// - /// 游戏类型 - /// - public GameTypeEnum GameType { get; set; } - - /// - /// 房间等级 - /// - public int RoomLevel { get; set; } = 0; - - /// - /// 房间分区数量 - /// - public int RoomPartitionNum { get; set; } = 0; - - /// - /// 房间数量 - /// - public int RoomCount{ get; set; } = 0; - - /// - /// 进房金币限制 - /// - public int RoomGoldLimit { get; set; } = 0; - - /// - /// 炮倍列表 - /// - public List CannonMultipleList { get; set; } = new List(); - - } - - /// - /// 出鱼配置 - /// - public class RoomFishConfig - { - /// - /// 游戏类型 - /// - public GameTypeEnum GameType { get; set; } - - /// - /// 普通鱼配置列表 - /// - public List NormalFishList { get; set; } = new List(); - - /// - /// 按照房间等级出鱼配置 - /// - - public List RoomFishLevelList { get; set; } = new List(); - } - /// - /// 按照房间等级出鱼配置 - /// - - public class RoomFishLevelConfig : RoomFishDetailConfig - { - public int RoomLevel { get; set; } = 0; - } - - /// - /// 出鱼配置 - /// - public class RoomFishDetailConfig - { - - /// - /// 类型 1 鱼 2 鱼阵 - /// - public int Type { get; set; } = 0; - - /// - /// 鱼种编号或鱼阵编号 - /// - public string FishNumber { get; set; } = string.Empty; - /// - /// 出鱼权重 - /// - public int FishWeight { get; set; } = 0; - /// - /// 出鱼频率 秒 - /// - public int FishFrequency { get; set; } = 0; - /// - /// 场内最大数量 - /// - public int MaxCount { get; set; } = 0; - } - - /// - /// 鱼阵配置 - /// - public class FishArrayConfig - { - - /// - /// 鱼阵编号 - /// - public string FishArrayNumber { get; set; } = string.Empty; - - /// - /// 名字 - /// - public string Name { get; set; } = string.Empty; - - /// - /// Boss鱼编号 - /// - public string BossFishNumber { get; set; } = string.Empty; - - /// - /// Boss数量 - /// - public int BoosCount { get; set; } = 0; - - - /// - /// 普通鱼 - /// - public string FishNumber { get; set; } = string.Empty; - /// - /// 普通鱼数量 - /// - public int FishCount { get; set; } = 0; - /// - /// 阵型编号 - /// - public string ArrayNumber { get; set; } = string.Empty; - - /// - /// 路径集合 - /// - public List PathList { get; set; } = new List(); - - /// - /// 阈值 - /// - public List ThresholdList { get; set; } = new List(); - - } - /// - /// 用户等级配置 - /// - public class UserLevelConfig - { - /// - /// 等级 - /// - public int Level { get; set; } = 0; - /// - /// 经验值下限 - /// - public int ExpMin { get; set; } = 0; - /// - /// 经验值上限 - /// - public int ExpMax { get; set; } = 0; - - /// - /// 金币 - /// - public int Gold { get; set; } = 0; - /// - /// 钻石 - /// - public int Diamond { get; set; } = 0; - - /// - /// 道具列表 - /// - public List ProductList { get; set; } = new List(); - } - /// - /// 道具信息 - /// - public class PropInfConfig: BasePropInfo - { - /// - /// 关联游戏 空为未设置 关联所有 - /// - public List GameNumber { get; set; } = new List(); - - /// - /// 有效期 单位天 0为不限制天数 - /// - public int Day { get; set; } = 0; - } - - /// - /// 道具碎片信息 - /// - public class PropFragmentConfig : BasePropInfo - { - /// - /// 碎片合成数量 - /// - public int FragmentCount { get; set; } = 0; - /// - /// 碎片合成后道具编号 - /// - public string ProductNumber { get; set; } = string.Empty; - } - /// - /// 道具基础信息 - /// - - public class BasePropInfo:BaseProduct - { - /// - /// 售卖方式 - /// - public SaleTypeEnum SaleType { get; set; } = SaleTypeEnum.金币; - - /// - /// 售卖价格 - /// - public int Price { get; set; } = 0; - /// - /// 售卖数量 - /// - public int SaleCount { get; set; } = 1; - - /// - /// 会员价格 - /// - public int VIPPrice { get; set; } = 0; - - /// - /// 经销商价格 - /// - public int DealerPrice { get; set; } = 0; - - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } = true; - - /// - /// 是否销售 - /// - public bool IsSale { get; set; } = true; - } - /// - /// Vip等级配置 - /// - public class VipLevelConfig - { - /// - /// Vip等级 - /// - public int Level { get; set; } = 0; - - /// - /// 经验值上限 - /// - public int ExpMax { get; set; } = 0; - - /// - /// 经验值下线 - /// - public int ExpMin { get; set; } = 0; - - /// - /// 签到加成 - /// - public double SignInAdd { get; set; } = 0; - - /// - /// Vip等级礼包列表 - /// - public List GiftList { get; set; } = new List(); - /// - /// 每日礼包 - /// - - public List DailyGift { get; set; } = new List(); - - - } - /// - ///礼包配置 - /// - public class GiftConfig - { - - /// - /// 类型 1 金币 2 钻石 3 道具 - /// - public int Type { get; set; } = 0; - - /// - /// 是否随机值 - /// - public bool IsRandom { get; set; } = false; - - /// - /// 奖励数量 - /// - public int Count { get; set; } = 0; - - /// - /// 道具数量随机最小值 - /// - public int MinCount { get; set; } = 0; - - /// - /// 道具数量随机最大值 - /// - public int MaxCount { get; set; } = 0; - - /// - /// 道具信息 - /// - public BaseProduct Product { get; set; } - } - /// - /// 签到奖励配置 - /// - public class SignConfig - { - /// - /// 排序 - /// - public int Order { get; set; } = 0; - - /// - /// 金币 - /// - public int Gold { get; set; } = 0; - - /// - /// 名称 - /// - public string Name { get; set; } = string.Empty; - - /// - /// 图标地址 - /// - public string Icon { get; set; } = string.Empty; - - /// - /// 概率 - /// - public double Probability { get; set; } = 0; - } - /// - /// 月卡配置 - /// - public class MonthCardConfig - { - - /// - /// 类型 1 周卡 2 月卡 3 年卡 - /// - public int Type { get; set; } = 0; - - /// - /// 名称 - /// - public string Name { get; set; } = string.Empty; - - /// - /// 签到加成 - /// - public double SignInAdd { get; set; } = 0; - - /// - /// 价格 金币 - /// - public int Gold { get; set; } = 0; - - /// - /// 现金价格 - /// - public double Money { get; set; } = 0; - - /// - /// 权益礼包 - /// - - public List GiftList { get; set; } = new List(); - - /// - /// 每日礼包 - /// - public List DailyGift { get; set; } = new List(); - - - } - /// - /// 救济配置 - /// - public class ReliefConfig - { - /// - /// 是否开启 - /// - public bool IsOpen { get; set; } = true; - - /// - /// 金币数量 - /// - public int Gold { get; set; } = 10000; - - /// - /// 每天可以领取的次数 - /// - public int Count { get; set; } = 3; - - /// - /// 领取金币的限制 - /// - public int Limit { get; set; } = 10000; - } - /// - /// 金币商城配置 - /// - public class GoldShopConfig - { - /// - /// 商品编号 - /// - public string Number { get; set; } = string.Empty; - - /// - /// 商品名称 - /// - public string Name { get; set; } = string.Empty; - - /// - /// 图标地址 - /// - public string Icon { get; set; } = string.Empty; - - /// - /// 金币数量 - /// - public int Gold { get; set; } = 0; - /// - /// 钻石数量 - /// - - public int Diamond { get; set; } = 0; - } - - /// - /// 钻石商城配置 - /// - public class DiamondShopConfig - { - /// - /// 商品编号 - /// - public string Number { get; set; } = string.Empty; - - /// - /// 商品名称 - /// - public string Name { get; set; } = string.Empty; - - /// - /// 图标地址 - /// - public string Icon { get; set; } = string.Empty; - - /// - /// 钻石数量 - /// - public int Diamond { get; set; } = 0; - - /// - /// 现金价格 - /// - public double Money { get; set; } = 0; - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/GameBaseConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/GameBaseConfig.cs.meta deleted file mode 100644 index 6f02d2188..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/GameBaseConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 012e05ae29dc5864b8cf73f44a6acf78 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/MongoBaseEntity.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/MongoBaseEntity.cs deleted file mode 100644 index 655df2326..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/MongoBaseEntity.cs +++ /dev/null @@ -1,26 +0,0 @@ - -namespace Model.Entity.BaseModel -{ - /// - /// Mongo实体基类 - /// - public class MongoBaseEntity - { - /// - /// 数据id - /// - - public string Id { get; set; } - - /// - /// 是否删除 - /// - public bool IsDelete { get; set; }=false; - /// - /// 创建人信息 - /// - public OptionUserInfo? CreateInfo { get; set; } - - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/MongoBaseEntity.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/MongoBaseEntity.cs.meta deleted file mode 100644 index c824ee664..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/MongoBaseEntity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4704ab241c098984188317667cd515a7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/OptionUserInfo.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/OptionUserInfo.cs deleted file mode 100644 index 2c3f257a0..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/OptionUserInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace Model.Entity.BaseModel -{ - /// - /// 操作人信息实体类 - /// - - public class OptionUserInfo - { - - - /// - /// 操作人ID - /// - public string UserId { get; set; } - /// - /// 操作人名称 - /// - public string UserName { get; set; } - /// - /// 操作时间戳 - /// - public long OptionTime { get; set; } - } - -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/OptionUserInfo.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/OptionUserInfo.cs.meta deleted file mode 100644 index bcfc7442b..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/OptionUserInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fa23f130ae3eb014c8c41beb77483019 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/UserSimpleInfo.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/UserSimpleInfo.cs deleted file mode 100644 index e8a19c5cd..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/UserSimpleInfo.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace Model.Entity.BaseModel -{ - /// - /// 用户简单信息 - /// - - public class UserSimpleInfo - { - - - /// - /// 用户名 - /// - public string UserName { get; set; } - /// - /// 用户id - /// - public string UserId { get; set; } - /// - /// 序号，唯一标识用户身份的序号 - /// - public string Number { get; set; } - - /// - /// 头像地址 - /// - public string AvatarUrl { get; set; } - - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/UserSimpleInfo.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/UserSimpleInfo.cs.meta deleted file mode 100644 index c05accc20..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/UserSimpleInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 24606b5329d1a284ba98ec5a342a74c8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/GameConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/GameConfig.cs deleted file mode 100644 index 1c4d0f201..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/GameConfig.cs +++ /dev/null @@ -1,86 +0,0 @@ -using Model.Entity.BaseModel; -using System.Collections.Generic; - -namespace Model.Entity -{ - /// - /// 后台配置信息实体类 - /// - - public class GameConfig : MongoBaseEntity - { - - /// - /// 鱼种配置 - /// - public List FishTypeConfigs { get; set; } = new List(); - - /// - /// 房间配置 - /// - public List RoomConfigs { get; set; } = new List(); - - /// - /// 出鱼配置 - /// - public List RoomFishConfigs { get; set; } = new List(); - - /// - /// 鱼阵配置 - /// - public List FishArrayConfigs { get; set; } = new List(); - - - /// - /// 用户等级配置 - /// - public List UserLevelConfigs { get; set; } = new List(); - - - /// - /// 道具表 - /// - public List PropConfig { get; set; } = new List(); - - /// - /// 道具碎片表 - /// - public List PropFragments { get; set; } = new List(); - - - //刮刮卡配置 - - - /// - /// Vip等级配置 - /// - public List VipLevelConfigs { get; set; } = new List(); - - /// - /// 签到池配置 - /// - public List SignConfigs { get; set; } = new List(); - - /// - /// 月卡配置 - /// - public List MonthCardConfigs { get; set; } = new List(); - - /// - /// 救济金配置 - /// - public ReliefConfig ReliefConfigs { get; set; } = new ReliefConfig(); - - - /// - /// 金币商城配置 - /// - public List GoldShopConfigs { get; set; } = new List(); - - /// - /// 钻石商城配置 - /// - public List DiamondShopConfigs { get; set; } = new List(); - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/GameConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/GameConfig.cs.meta deleted file mode 100644 index eaaa86eef..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/GameConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9ce903c3751deb24ca86550c29fa4918 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/Other/Notice.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/Other/Notice.cs deleted file mode 100644 index b653750c3..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/Other/Notice.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Model.Entity.BaseModel; - -namespace Model.Entity.Other -{ - /// - /// 公告信息实体类 - /// - - public class Notice : MongoBaseEntity - { - /// - /// 标题 - /// - public string Title { get; set; } - /// - /// 内容 - /// - public string Content { get; set; } - - /// - /// 简介 - /// - public string Recommend { get; set; } - /// - /// 创建时间 - /// - public long CreateTime { get; set; } - - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/Other/Notice.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/Other/Notice.cs.meta deleted file mode 100644 index 18e333c21..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/Other/Notice.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cdac2cda30a55a64bb5108a6a748c8a4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/GameRoom.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/GameRoom.cs deleted file mode 100644 index 514ea0ca4..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/GameRoom.cs +++ /dev/null @@ -1,14 +0,0 @@ - - -using Model.Entity.BaseModel; - -namespace Model.Entity.User -{ - /// - /// 游戏房间 - /// - - public class GameRoom:MongoBaseEntity - { - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/GameRoom.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/GameRoom.cs.meta deleted file mode 100644 index 6c0959ccb..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/GameRoom.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d68102352f40f9b43bdc198039b80ac0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEmail.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEmail.cs deleted file mode 100644 index cbccdd0a9..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEmail.cs +++ /dev/null @@ -1,57 +0,0 @@ -using Model.Entity.BaseModel; -using System; -using System.Collections.Generic; - -namespace Model.Entity.User -{ - /// - /// 用户邮件实体类 - /// - - public class UserEmail : MongoBaseEntity - { - /// - /// 用户id - /// - public string UserId { get; set; } - - /// - /// 邮件标题 - /// - public string Title { get; set; } - /// - /// 邮件内容 - /// - public string Content { get; set; } - /// - /// 发送时间 - /// - public long SendTime { get; set; } - /// - /// 阅读时间 - /// - public long ReadTime { get; set; }=0; - /// - /// 是否已读 - /// - public bool IsRead { get; set; }=false; - - /// - /// 奖励是否领取 - /// - public bool IsReward { get; set; }=false; - /// - /// 奖励钻石数量 - /// - public int RewardDiamond { get; set; }=0; - /// - /// 奖励金币数量 - /// - public int RewardGold { get; set; }=0; - /// - /// 奖励道具列表 - /// - public List RewardItems { get; set; } = new List(); - } - -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEmail.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEmail.cs.meta deleted file mode 100644 index 230faa74c..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEmail.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7672f4238c508d84d8c90ce755dadd93 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEntity.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEntity.cs deleted file mode 100644 index 6a6376628..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEntity.cs +++ /dev/null @@ -1,364 +0,0 @@ -using Model.Entity.BaseModel; -using System.Collections.Generic; - -namespace Model.Entity.User -{ - /// - /// 用户实体类 - /// - - public class UserEntity : MongoBaseEntity - { - - /// - /// 基础信息，包括昵称、头像等基本信息 - /// - public UserBaseInfo BaseInfo= new UserBaseInfo(); - - /// - /// 实名认证信息 - /// - - public RealNameInfo RealName { get; set; } - - /// - /// 保险箱信息 - /// - - public SafeBoxInfo SafeBox { get; set; } = new SafeBoxInfo(); - - /// - /// 签到 - /// - public SignInfo Sign { get; set; } - - /// - /// 已有炮台列表 - /// - public List CannonList { get; set; }=new List(); - - /// - /// 正在使用的炮台信息 - /// - public BaseUserProp CannonUsing { get; set; } - - /// - /// 使用中的翅膀 - /// - public BaseUserProp WingUsing { get; set; } - - /// - /// 已有翅膀列表 - /// - public List WingList { get; set; } = new List(); - - - /// - /// 使用中的战神 - /// - public BaseUserProp GodWarUsing { get; set; } - - /// - /// 已有战神列表 - /// - public List GodWarList { get; set; } = new List(); - - /// - /// 我的背包 - /// - - public List Props { get; set; } = new List(); - - /// - /// 资产信息、 - /// - - public Assets Assets { get; set; } = new Assets(); - /// - /// 注册时间戳，单位为秒 - /// - public long CreateTime { get; set; } = 0; - - /// - /// 封号信息 - /// - - public BanInfo BanInfo { get; set; } - /// - /// 玩家统计信息 - /// - - public StaticInfo Static { get; set; } = new StaticInfo(); - - - - } - /// - /// 签到信息 - /// - public class SignInfo - { - /// - /// 是否签到，默认为false - /// - public bool IsSign { get; set; } = false; - /// - /// 签到时间戳，单位为秒 - /// - public long SignTime { get; set; } = 0; - } - - /// - /// 玩家统计信息 - /// - public class StaticInfo - { - - /// - /// 最后一次登录时间戳，单位为秒 - /// - public long LastLoginTime { get; set; } = 0; - /// - /// 最后一次登录IP地址 - /// - public string LastLoginIp { get; set; } = ""; - - /// - /// 在线时长 - /// - public long OnlineTime { get; set; } = 0; - - /// - /// 游戏时长 - /// - public long GameTime { get; set; } = 0; - - /// - /// 所在房间 - /// - public string RoomNumber { get; set; } = ""; - - /// - /// 累计充值 - /// - public double TotalRecharge { get; set; } = 0; - - /// - /// 累计消费金币 - /// - public int TotalConsumeGold { get; set; } = 0; - - /// - /// 累计消费钻石 - /// - public int TotalConsumeDiamond { get; set; } = 0; - - /// - /// 可以领取的次数 - /// - public int ReliefGoldCount {get; set; } = 0; - - - - } - /// - /// 封号信息 - /// - - public class BanInfo - { - /// - /// 是否封号，true为封号状态，false为正常状态。默认值为false（未被封号）。 - /// - public bool IsBan { get; set; } = false; - /// - /// 封号时间 - /// - public long BanTime { get; set; } = 0; - /// - /// 封号原因 - /// - public string BanReason { get; set; } = ""; - /// - /// 封号天数 - /// - public int BanDays { get; set; } = 0; - /// - /// 封号到期时间 - /// - public long BanEndTime { get; set; } = 0; - } - /// - /// 用户基本信息 - /// - - public class UserBaseInfo - { - /// - /// 用户名 - /// - public string UserName { get; set; } = string.Empty; - /// - /// 密码 - /// - public string Password { get; set; } = string.Empty; - - /// - /// 序号，唯一标识用户身份的序号 - /// - public string Number { get; set; } = string.Empty; - - /// - /// 头像地址 - /// - public string AvatarUrl { get; set; } = string.Empty; - - /// - /// 手机号 - /// - public string Mobile { get; set; } = string.Empty; - /// - /// 第三方登陆信息 - /// - public string WXOpenId { get; set; } = string.Empty; - - /// - /// 渠道编号 - /// - public string Channel { get; set; } = string.Empty; - - /// - /// 是否红色昵称 - /// - public bool IsRedName { get; set; } = false; - } - - - /// - /// 资产信息 - /// - - public class Assets - { - /// - /// 钻石数量 - /// - public int Diamond { get; set; } = 0; - /// - /// 金币数量 - /// - public int Gold { get; set; } = 0; - /// - /// 等级 - /// - public int Level { get; set; } = 1; - /// - /// 经验值 - /// - public int Exp { get; set; } = 0; - - - - /// - /// Vip签到加成 - /// - public double VipSignInAdd { get; set; } = 0; - /// - /// Vip等级 - /// - public int VipLevel { get; set; } = 0; - - /// - /// 未领取的Vip礼包集合 - /// - - public List VipGift { get; set; } = new List(); - - - /// - /// vip每日礼包是否领取 - /// - public bool IsVipDayGift { get; set; } = false; - - - - /// - /// 会员卡签到加成 - /// - public double UserCardInAdd { get; set; } = 0; - - /// - /// 会员卡等级 1 周卡 2 月卡 3 年卡 - /// - public int UserCardLevel { get; set; } = 0; - - - /// - /// 会员卡到期时间 - /// - public long UserCardEndTime { get; set; } = 0; - /// - /// 月卡每日礼包是否领取 - /// - public bool IsUserCardDayGift { get; set; } = false; - - /// - /// 未领取的权益礼包集合 - /// - - public List UserCardGift { get; set; } = new List(); - - - } - /// - /// 实名信息 - /// - - public class RealNameInfo - { - /// - /// 真实名字 - /// - public string RealName { get; set; } = string.Empty; - /// - /// 身份证号 - /// - public string IDCard { get; set; } = string.Empty; - } - /// - /// 保险箱 - /// - - public class SafeBoxInfo - { - /// - /// 存储金额 - /// - public int Amount { get; set; } = 0; - - /// - /// 密码 - /// - public string Password { get; set; } = ""; - - /// - /// 存储时间 - /// - public long SaveTime { get; set; } = 0; - } - - /// - /// 用户道具 - /// - public class BaseUserProp : BaseProduct - { - /// - /// 是否试用 - /// - public bool IsTrial { get; set; } = false; - /// - /// 体验截止时间 - /// - public long TrialEndTime { get; set; } = 0; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEntity.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEntity.cs.meta deleted file mode 100644 index 47cb5eb00..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserEntity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0daa07e113165d84c86e9d731b5f7567 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserTask.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserTask.cs deleted file mode 100644 index 2c6a90469..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserTask.cs +++ /dev/null @@ -1,77 +0,0 @@ -using Assets.MyGame.Scripts.Net.APIResponses.Enum; -using Model.Entity.BaseModel; - -namespace Model.Entity.User -{ - /// - /// 用户任务 - /// - - public class UserTask : MongoBaseEntity - { - /// - /// 用户Id - /// - public string UserId { get; set; } - /// - /// 任务编号 - /// - public string Number { get; set; } - /// - /// 任务描述 - /// - public string Remark { get; set; } - /// - /// 任务类型 - /// - public TaskType TaskType { get; set; } - /// - /// 任务事件 - /// - public TaskEvent TaskEvent { get; set; } - /// - /// 任务条件 - /// - public int TaskCount { get; set; } - /// - /// 当前进度 - /// - public int Count { get; set; } - - /// - /// 是否完成 - /// - public bool IsFinish { get; set; }=false; - - /// - /// 关联Id 如好友Id - /// - public string OtherId { get; set; } - - /// - /// 是否领取奖励 - /// - public bool IsGet { get; set; }=false; - - /// - /// 任务添加时间 - /// - public long TaskAddTime { get; set; } - /// - /// 任务结束时间 - /// - public long TaskEndTime { get; set; }=0; - - /// - /// 任务完成时间 - /// - - public long TaskFinishTime { get; set; } = 0; - - /// - /// 奖励礼包 - /// - - public GiftConfig GiftConfig { get; set; } = null; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserTask.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserTask.cs.meta deleted file mode 100644 index 9f52e1818..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/User/UserTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e749863c93f5e8444b5be2583ef161b6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/BaseListPageParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/BaseListPageParam.cs deleted file mode 100644 index ab25d8b5d..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/BaseListPageParam.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param -{ - /// - /// 公共分页参数 - /// - public class BaseListPageParam - { - private string _keyword = ""; - private int _page = 1; - private int _pageSize = 10; - /// - /// 关键词 - /// - public string KeyWord - { - get { return string.IsNullOrWhiteSpace(_keyword) ? "" : _keyword.Trim(); } - set { _keyword = string.IsNullOrWhiteSpace(value) ? "" : value.Trim(); } - } - - - /// - /// 页码 - /// - public int? PageIndex - { - get { return _page <= 1 ? 1 : _page; } - set { _page = value ?? 0; } - } - - /// - /// 每页数量 - /// - public int? PageSize - { - get { return _pageSize <= 1 ? 10 : _pageSize; } - set { _pageSize = value ?? 0; } - } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/BaseListPageParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/BaseListPageParam.cs.meta deleted file mode 100644 index 14394c2f9..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/BaseListPageParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d6f9153b1b2b07048a7f4805999a7192 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/CreateRoomParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/CreateRoomParam.cs deleted file mode 100644 index e87dfd519..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/CreateRoomParam.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param -{ - /// - /// 创建房间参数 - /// - public class CreateRoomParam - { - - /// - /// 房间id - /// - public string roomId { get; set; } - - /// - /// 用户ID - /// - public string userId { get; set; } - /// - /// 用户名称 - /// - - public string userName { get; set; } - - /// - /// 用户头像 - /// - public string userAvatar { get; set; } - - /// - /// 游戏类型 1 我方黑 2 我方红 - /// - public int gameType { get; set; } - - /// - /// 密码，可为空字符串 - /// - public string password { get; set; } - - /// - /// 金币数量 - /// - public int gold { get; set; } = 1000; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/CreateRoomParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/CreateRoomParam.cs.meta deleted file mode 100644 index 0b1dc07ed..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/CreateRoomParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 433879f7eac6e6344a0ac77c21d74016 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GameConfigParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GameConfigParam.cs deleted file mode 100644 index bb7c942dd..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GameConfigParam.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Model.Entity; -using Model.Entity.BaseModel; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.Game -{ - public class GameConfigParam - { - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GameConfigParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GameConfigParam.cs.meta deleted file mode 100644 index 606ce3183..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GameConfigParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 68ea623d07b0e6645bf687972fa1217f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetBannerListParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetBannerListParam.cs deleted file mode 100644 index a9bfe5370..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetBannerListParam.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.Game -{ - /// - /// 获取广告位列表 - /// - public class GetBannerListParam : BaseListPageParam - { - /// - /// 状态 1 使用中 2 已停止 -1是全部 - /// - public int State { get; set; } = -1; - - /// - /// 位置 - /// - - public string? Position { get; set; } = ""; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetBannerListParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetBannerListParam.cs.meta deleted file mode 100644 index 73bcda31a..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetBannerListParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 954b8a086f92b09459b03416599ad17c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetTaskListParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetTaskListParam.cs deleted file mode 100644 index 5cae00b1f..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetTaskListParam.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Model.Param.Game -{ - /// - /// 获取任务列表参数 - /// - public class GetTaskListParam:BaseListPageParam - { - /// - /// 任务状态 1 上架 2 下架 -1全部 - /// - public int State { get; set; } = -1; - /// - /// 任务类型 -1 全部 - /// - public int TaskType { get; set; } = -1; - /// - /// 任务事件 -1 全部 - /// - public int TaskEvent { get; set; } = -1; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetTaskListParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetTaskListParam.cs.meta deleted file mode 100644 index 1baae0dc3..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetTaskListParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cf85dde803c06ea42a9718ee2a8bcc90 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetUserTaskListParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetUserTaskListParam.cs deleted file mode 100644 index 8841735eb..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetUserTaskListParam.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Model.Param.Game -{ - /// - /// 获取玩家任务列表参数 - /// - public class GetUserTaskListParam - { - /// - /// 任务类型 -1 全部 - /// - public int TaskType { get; set; } = -1; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetUserTaskListParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetUserTaskListParam.cs.meta deleted file mode 100644 index 63be6c412..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Game/GetUserTaskListParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2903ea713e3e1124cb8a720dc827d84c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/AddNoticeParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/AddNoticeParam.cs deleted file mode 100644 index 802915c17..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/AddNoticeParam.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.Other -{ - /// - /// 添加公告参数类 - /// - public class AddNoticeParam - { - /// - /// 标题 - /// - public string Title { get; set; } - /// - /// 内容 - /// - public string Content { get; set; } - - /// - /// 简介 - /// - public string Recommend { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/AddNoticeParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/AddNoticeParam.cs.meta deleted file mode 100644 index a34452fc0..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/AddNoticeParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d22d98b8ef826e84d93552628a5be101 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/GetNoticeListParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/GetNoticeListParam.cs deleted file mode 100644 index b1d0f0c51..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/GetNoticeListParam.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.Other -{ - /// - /// 公告列表参数类 - /// - public class GetNoticeListParam : BaseListPageParam - { - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/GetNoticeListParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/GetNoticeListParam.cs.meta deleted file mode 100644 index ee67c5786..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/GetNoticeListParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 140676c3e89ecb149bdc400d1627f55a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/UpdateNoticeParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/UpdateNoticeParam.cs deleted file mode 100644 index 766c7f881..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/UpdateNoticeParam.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Model.Param.Other -{ - /// - /// 更新公告参数类 - /// - public class UpdateNoticeParam : AddNoticeParam - { - /// - /// 公告id - /// - public string Id { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/UpdateNoticeParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/UpdateNoticeParam.cs.meta deleted file mode 100644 index 1bf95b7a0..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/Other/UpdateNoticeParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0ba53c0cd2f8bef489a5f26145316a52 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/AddUserPropParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/AddUserPropParam.cs deleted file mode 100644 index 727ccae7b..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/AddUserPropParam.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.User -{ - /// - /// 添加玩家道具参数 - /// - public class AddUserPropParam - { - /// - /// 道具id - /// - public string PropId { get; set; } - /// - /// 数量 - /// - public int Count { get; set; } - /// - /// 类型 3 鱼苗 4 鱼食 5鱼池 6 宝箱 7 锦鲤 8 装饰 9 清洁 - /// - - public int Type { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/AddUserPropParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/AddUserPropParam.cs.meta deleted file mode 100644 index 8ebe4732c..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/AddUserPropParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9bfb0d0e9d2231b4f930dfc560662e63 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/CompletedTaskParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/CompletedTaskParam.cs deleted file mode 100644 index 40ab0796e..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/CompletedTaskParam.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Assets.MyGame.Scripts.Net.APIResponses.Enum; - -namespace Model.Param.User -{ - /// - /// 已完成的任务参数类 - /// - public class CompletedTaskParam - { - - /// - /// 任务事件类型 - /// - public TaskEvent taskEvent { get; set; } - /// - /// 用户ID - /// - public string userId { get; set; }=string.Empty; - /// - /// 根据传回数据判断任务是否 完成 - /// - public int count { get; set; } = 0; - - /// - /// 其他ID，比如好友ID等 - /// - public string otherId { get; set; } = ""; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/CompletedTaskParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/CompletedTaskParam.cs.meta deleted file mode 100644 index 7637713fa..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/CompletedTaskParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: beb8f2ce8ffcec1459d1cbbc02ff97c9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/GetEmailPageParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/GetEmailPageParam.cs deleted file mode 100644 index 66f332968..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/GetEmailPageParam.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.User -{ - /// - /// 获取邮箱列表参数类 - /// - public class GetEmailPageParam : BaseListPageParam - { - - /// - /// 邮箱状态 0全部 1 已读 2 未读 - /// - public int ReadStatus { get; set; } - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/GetEmailPageParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/GetEmailPageParam.cs.meta deleted file mode 100644 index e493de1e2..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/GetEmailPageParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1621d46a351989842a3b03dfad91bb3d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserParam.cs deleted file mode 100644 index e736d7c99..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserParam.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.User -{ - /// - /// 注册用户请求参数 - /// - public class RegisterUserParam - { - - /// - /// 短信验证码 - /// - public string Code { get; set; } - /// - /// 手机号 - /// - public string? Mobile { get; set; } - /// - /// 邀请码 - /// - public string? InviteCode { get; set; } - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserParam.cs.meta deleted file mode 100644 index 902bb0ac4..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9f7c96c87de57d54b96d84b90d3a6493 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserWeiXinParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserWeiXinParam.cs deleted file mode 100644 index 13bf87880..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserWeiXinParam.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.User -{ - /// - /// 注册用户请求参数 - /// - public class RegisterUserWeiXinParam - { - /// - /// 第三方标识Id - /// - public string? OpenId { get; set; } - - /// - /// 用户昵称 - /// - public string? NickName { get; set; } - - /// - /// 头像地址 - /// - public string? AvatarUrl { get; set; } - - /// - /// 邀请码 - /// - public string? InviteCode { get; set; } - - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserWeiXinParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserWeiXinParam.cs.meta deleted file mode 100644 index 4ef1ac388..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/RegisterUserWeiXinParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 813a2f9e48988354da7e4be83b1cfa5f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/SendEmailParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/SendEmailParam.cs deleted file mode 100644 index b1c94399e..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/SendEmailParam.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Model.Entity.BaseModel; -using Model.Entity.User; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.User -{ - /// - /// 发送邮件业务参数类 - /// - public class SendEmailParam - { - - - /// - /// 接收者 用户id - /// - public string? UserId { get; set; } - /// - /// 邮件标题 - /// - public string? Title { get; set; } - /// - /// 邮件内容 - /// - public string? Content { get; set; } - /// - /// 奖励钻石数量 - /// - public int RewardDiamond { get; set; } = 0; - /// - /// 奖励积分数量 - /// - public int RewardGold { get; set; } = 0; - /// - /// 奖励道具列表 - /// - public List? RewardItems { get; set; } = null; - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/SendEmailParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/SendEmailParam.cs.meta deleted file mode 100644 index a3f611cd9..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/SendEmailParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 809d01fcc0977554eb3abfff7ef5a69f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/UpdateUserDataParam.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/UpdateUserDataParam.cs deleted file mode 100644 index 8caf1e565..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/UpdateUserDataParam.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Param.User -{ - /// - /// 更新用户参数 - /// - public class UpdateUserDataParam - { - - /// - /// 用户ID - /// - public string Id { get; set; } - /// - /// 钻石数量 - /// - public int Diamond { get; set; } = 0; - /// - /// 金币数量 - /// - public int Gold { get; set; } = 0; - /// - /// 等级 - /// - public int Level { get; set; } = 1; - /// - /// 经验值 - /// - public int Exp { get; set; } = 0; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/UpdateUserDataParam.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/UpdateUserDataParam.cs.meta deleted file mode 100644 index 9ba371710..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Param/User/UpdateUserDataParam.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 23c6fb7aa5e38e34a99b327531b8f5c6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/StatisticsResult.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/StatisticsResult.cs deleted file mode 100644 index 1149ee8dc..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/StatisticsResult.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Response -{ - public class StatisticsResult - { - /// - /// 在线用户数 - /// - public int OnlineUsers { get; set; } - /// - /// 总访问数 - /// - public long TotalVisits { get; set; } - /// - /// 今日访问数 - /// - public long TodayVisits { get; set; } - /// - /// 本月访问数 - /// - public long ThisMonthVisits { get; set; } - /// - /// 总流量（字节） - /// - public long TotalTraffic { get; set; } - /// - /// 总流量（格式化） - /// - public object TotalTrafficFormatted { get; set; } - /// - /// 今日流量（字节） - /// - public long TodayTraffic { get; set; } - /// - /// 今日流量（格式化） - /// - public object TodayTrafficFormatted { get; set; } - /// - /// 本月流量（字节） - /// - public long ThisMonthTraffic { get; set; } - /// - /// 本月流量（格式化） - /// - public object ThisMonthTrafficFormatted { get; set; } - /// - /// 最后更新时间 - /// - public DateTime LastUpdated { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/StatisticsResult.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/StatisticsResult.cs.meta deleted file mode 100644 index 6cc8081b9..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/StatisticsResult.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8b0820ad90319bb4ab4f50cf029962f3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/GiftResponse.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/GiftResponse.cs deleted file mode 100644 index 26b6af69f..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/GiftResponse.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Model.Entity.BaseModel; - -namespace Model.Response.User -{ - /// - /// 礼物响应类 - /// - public class GiftResponse - { - /// - /// 金币数量 - /// - public int Gold { get; set; } = 0; - /// - /// 钻石数量 - /// - public int Diamond { get; set; } - /// - /// 商品列表 - /// - public List Product { get; set; } = new List(); - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/GiftResponse.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/GiftResponse.cs.meta deleted file mode 100644 index 352e78b91..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/GiftResponse.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 083d72e6d9537de4aa9b03c8fbba2e11 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/InviteFriendListResponse.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/InviteFriendListResponse.cs deleted file mode 100644 index 7f3afe15e..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/InviteFriendListResponse.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Model.Entity.User; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Response.User -{ - - /// - /// 邀请好友列表响应 - /// - public class InviteFriendListResponse - { - /// - /// 用户列表 - /// - public UserEntity User { get; set; } - - /// - /// 状态码 1未领取 2 已领取 - /// - public int State { get; set; } - - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/InviteFriendListResponse.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/InviteFriendListResponse.cs.meta deleted file mode 100644 index 8a7dd9ddc..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/InviteFriendListResponse.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d3474b19ad461354ea78525b1529f692 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/RankingResponse.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/RankingResponse.cs deleted file mode 100644 index 17bd0cfda..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/RankingResponse.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Response.User -{ - /// - /// 排行榜响应类 - /// - public class RankingResponse - { - - /// - /// 用户列表 - /// - public List UserList { get; set; }=new List(); - - /// - /// 用户信息 - /// - public RankingUserResponse User { get; set; } - } - /// - /// 排行榜用户信息响应类 - /// - public class RankingUserResponse - { - /// - /// 用户Id - /// - public string UserId{ get; set; } - /// - /// 排名 - /// - - public int Rank { get; set; } - /// - /// 用户名 - /// - public string UserName { get; set; } - - /// - /// 序号，唯一标识用户身份的序号 - /// - public string Number { get; set; } - - /// - /// 头像地址 - /// - public string AvatarUrl { get; set; } - - /// - /// 手机号 - /// - public string Mobile { get; set; } - - /// - /// 等级 - /// - public int Level { get; set; } - - /// - /// 锦鲤数量 - /// - public int FishCount { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/RankingResponse.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/RankingResponse.cs.meta deleted file mode 100644 index a8d79d03d..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/RankingResponse.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7d6ec44dc383252439bec69166ebb970 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserFriendResponse.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserFriendResponse.cs deleted file mode 100644 index 65c325866..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserFriendResponse.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Response.User -{ - /// - /// 用户好友响应类 - /// - public class UserFriendResponse - { - /// - /// 用户ID - /// - public string UserId { get; set; } - /// - /// 昵称 - /// - public string NickName { get; set; } - /// - /// 头像地址 - /// - public string AvatarUrl { get; set; } - /// - /// 等级 - /// - public int Level { get; set; } = 1; - - /// - /// 战斗力 - /// - public int Combat { get; set; } = 1; - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserFriendResponse.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserFriendResponse.cs.meta deleted file mode 100644 index 654e16eed..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserFriendResponse.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1e4456d86496f1b4baedceeeccf14997 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserToken.cs b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserToken.cs deleted file mode 100644 index be47a239e..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserToken.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Model.Entity.User; -namespace Model.Response.User -{ - /// - /// 用户token信息 - /// - public class UserToken: UserEntity - { - public string Token { get; set; } - } -} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserToken.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserToken.cs.meta deleted file mode 100644 index 1bb62c474..000000000 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Response/User/UserToken.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 31be3f05f0d226e4bb8ff4bdf1d6b8e1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs b/Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs new file mode 100644 index 000000000..05c290f82 --- /dev/null +++ b/Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs @@ -0,0 +1,11 @@ +public class UserBaseInfo +{ + public string userName { get; set; } + public string password { get; set; } + public string number { get; set; } + public string avatarUrl { get; set; } + public string mobile { get; set; } + public string wxOpenId { get; set; } + public string channel { get; set; } + public bool isRedName { get; set; } +} \ No newline at end of file diff --git a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdName.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs.meta similarity index 83% rename from Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdName.cs.meta rename to Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs.meta index fb9c93c0e..77e97786b 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/Model/Entity/BaseModel/BaseIdName.cs.meta +++ b/Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 172b3f3d7ea9c244eb69f81e78d07b4c +guid: 4f0adb90b7fac4f42b046634e32cd8f0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/MyGame/Scripts/Net/APIResponses/UserToken.cs b/Assets/MyGame/Scripts/Net/APIResponses/UserToken.cs index c4a736e53..950f62107 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/UserToken.cs +++ b/Assets/MyGame/Scripts/Net/APIResponses/UserToken.cs @@ -13,6 +13,10 @@ namespace Assets.MyGame.Scripts.Net.API [Serializable] public class UserToken { + /// + /// 基础信息，包括昵称、头像等基本信息 + /// + public UserBaseInfo BaseInfo = new UserBaseInfo(); /// /// 用户唯一 ID /// diff --git a/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs index 8dbfd1bc5..e461583be 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs @@ -1,6 +1,8 @@ -using Model.Entity.BaseModel; -using System; +using System; +using System.Collections; using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Networking; namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess { @@ -42,7 +44,7 @@ namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess /// /// 游戏房间 /// - public class ChessGameRoom : MongoBaseEntity + public class ChessGameRoom { /// /// 用户列表 @@ -88,6 +90,44 @@ namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess /// public class RedisGameUser { + //下载头像 失败最多重试5次 + + public IEnumerator DownTexture2d(System.Action action) + { + string url = userAvatar; + int downCount = 5; + Texture2D avatarTexture2D = new Texture2D(100, 100); + //if (avatarTexture2D == null) + for (int i = 0; i < downCount; i++) + { + using (UnityWebRequest www = UnityWebRequestTexture.GetTexture(url)) + { + yield return www.SendWebRequest(); + if (www.result == UnityWebRequest.Result.ConnectionError || + www.result == UnityWebRequest.Result.ProtocolError) + { + Debug.LogError("下载失败: " + www.error); + downCount++; + if (downCount == 5) + { + + action.Invoke(new Texture2D(100, 100)); + + yield break; + } + + } + else + { + avatarTexture2D = DownloadHandlerTexture.GetContent(www); + break; + } + } + } + + action.Invoke(avatarTexture2D); + + } /// /// 链接Id diff --git a/Assets/MyGame/Scripts/Net/WebResponses/GetRoomList.cs b/Assets/MyGame/Scripts/Net/WebResponses/GetRoomList.cs index 8783d613f..7ca75c892 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/GetRoomList.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/GetRoomList.cs @@ -13,6 +13,6 @@ namespace Assets.MyGame.Scripts.Net.WebResponses public int maxPlayerCount; public int currentOnlinePlayerCount; public int robotCount; - public int roomNumber; + public int roomNumber; } } diff --git a/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs b/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs index ecc02db68..40d31ccdf 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/RoomChangeResponse.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; [Serializable] public class RoomChangeResponse { + public static int CreateSitPos=0; /// /// 房间唯一 ID /// diff --git a/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs b/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs index b6710c5df..432c0acc3 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/RoomJoinNotice.cs @@ -47,7 +47,7 @@ namespace Assets.MyGame.Scripts.Net.WebResponses /// /// 玩家金币 /// - public int gold; + public long gold; /// /// 玩家钻石 diff --git a/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs b/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs index 98285a334..fc2d54ad8 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs @@ -1,4 +1,7 @@ -using System; +using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,20 +9,57 @@ using System.Threading.Tasks; namespace Assets.MyGame.Scripts.Net.WebResponses { + [Serializable] + public enum FrameDataType + { + none=0, + rotateTurrect, + fireBullet, + createFish, + changeAutoTarget + + } /// /// 同步游戏数据 /// [Serializable] public class SyncGameData { - public string sitPos; - public string name; - public string messageID; - public FrameData frameData; + public int sitPos; + public FrameDataType frameType; + public Object frameData; } + [Serializable] public class FrameData { - + + } + [Serializable] + public class FrameData_Rotate : FrameData + { + public float angle; + } + [Serializable] + public class FrameData_FireBullit : FrameData + { + public float angle; + public long gold; + public bool isSanShe; + public bool isSuoDing; + public bool auto; + public bool twoRTruuect; + public string monsterID; + } + [Serializable] + public class FrameData_CreateFish : FrameData + { + public RoomFishDetailConfig fish; + + } + [Serializable] + public class FrameData_ChangeAutoTarget : FrameData + { + public string targetGuid; } } diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager.cs b/Assets/MyGame/Scripts/Net/WebSocketManager.cs index 426f5f539..8db4ee6ef 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager.cs @@ -3,6 +3,7 @@ using Best.WebSockets; using Newtonsoft.Json; using System; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.SceneManagement; @@ -80,10 +81,10 @@ namespace Assets.MyGame.Scripts.Net WebSocketSendList.Bind(GameManager.Instance.user.id); break; case SocketType.room: - + break; case SocketType.game: - WebSocketSendList.JoinRoom("11109", GameManager.Instance.user.id,1); + break; case SocketType.chess: @@ -99,7 +100,11 @@ namespace Assets.MyGame.Scripts.Net { Debug.Log($"[WebSocket] {type} 连接关闭 Code:{code} Reason:{reason}"); // 自动重连 - StartCoroutine(Reconnect(type)); + if (code!=WebSocketStatusCodes.NormalClosure) + { + StartCoroutine(Reconnect(type)); + } + }; ws.OnClosed += (web, code, message) => @@ -145,7 +150,8 @@ namespace Assets.MyGame.Scripts.Net { if (sockets.TryGetValue(type, out var ws)) { - ws.Close(); + ws.Close(WebSocketStatusCodes.NormalClosure, "正常关闭"); // 或者 CloseStatusCode.Normal + //ws.Close(); sockets.Remove(type); } } diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs index 478c70f8a..b97937af0 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs @@ -58,10 +58,13 @@ namespace Assets.MyGame.Scripts.Net Screen.orientation = ScreenOrientation.Portrait; break; case "BeginGame": - - roomMainPanel.subUIManager.CloseAll(); - roomMainPanel.StartGame(msg); - + { + var va = JsonConvert.DeserializeObject>(msg.ToString()).arguments[0]; + roomMainPanel.subUIManager.CloseAll(); + roomMainPanel.StartGame(msg); + roomMainPanel.UpdateUserData(va); + } + break; case "CreateRoomNotice": { @@ -70,6 +73,7 @@ namespace Assets.MyGame.Scripts.Net if (panel != null) { panel.UpdataRoom(va); + } } @@ -109,6 +113,7 @@ namespace Assets.MyGame.Scripts.Net case "EndGameSuccess": { var va = JsonConvert.DeserializeObject>(msg).arguments[0]; + if (va == GameManager.Instance.user.id) { roomMainPanel.subUIManager.ShowAsync(UIPanel.ZGXQWin); @@ -119,6 +124,34 @@ namespace Assets.MyGame.Scripts.Net } } + break; + case "ExitRoomSuccess": + { + var va = JsonConvert.DeserializeObject>(msg).arguments[0]; + if (GameManager.Instance.user.id== va) + { + + WebSocketSendList.GetRoomListChineseChess(1); + + + } + else + { + for (int i = 0; i < roomMainPanel.roomData.users.Count; i++) + { + var item = roomMainPanel.roomData.users[i]; + if (item.userId != va) + { + roomMainPanel.roomData.users.Remove(item); + roomMainPanel.UpdateUserData(roomMainPanel.roomData); + i--; + } + } + + } + + } + break; case "ExitRoomNotice": @@ -129,6 +162,7 @@ namespace Assets.MyGame.Scripts.Net if (panel != null) { panel.UpdataRoom(va); + } } } @@ -136,6 +170,13 @@ namespace Assets.MyGame.Scripts.Net case "Disconnect": roomMainPanel.subUIManager.ShowAsync(UIPanel.ZGXQWin); break; + case "GameError": + { + var va = JsonConvert.DeserializeObject>(msg).arguments[0]; + UIManager.Instance.ShowBoard(va); + } + + break; default: break; } @@ -180,6 +221,25 @@ namespace Assets.MyGame.Scripts.Net case "SyncPlayerGold": WebSocketReponseList.SyncPlayerGold(msg); break; + case "GetRoomInfoResult": + WebSocketReponseList.GetRoomInfoResult(msg); + + break; + case "SyncGameData": + WebSocketReponseList.SyncGameDataResult(msg); + + break; + case "RoomLeaveNotice": + WebSocketReponseList.LeaveRoomResult(msg); + //WebSocketManager.Instance.Close(SocketType.game); + break; + case "ChangeControllerUser": + var userId = JsonConvert.DeserializeObject>(msg).arguments[0]; + if (userId==GameManager.Instance.user.id) + { + CreateFishManager.Instance.fangzhu = true; + } + break; default: break; } diff --git a/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs b/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs index bdcaf76f3..02c994b97 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs @@ -18,13 +18,13 @@ namespace Assets.MyGame.Scripts.Net /// public static void GetRoomListChineseChessResult(string msg) { - var var1 = UIManager.Instance.Show(UIPanel.MainGamePanelZGXQ,msg); + var var1 = UIManager.Instance.Show(UIPanel.MainGamePanelZGXQ, msg); } public static void GetGoldConfigSuccessChineseChessResult(string msg) { UIManager.Instance.Get(UIPanel.MainGamePanelZGXQ).subUIManager.ShowAsync(UIPanel.ZGXQGameExplain); } - + /// /// 获取房间列表 room /// @@ -32,7 +32,30 @@ namespace Assets.MyGame.Scripts.Net public static void GetRoomListResult(string msg) { var var1 = UIManager.Instance.Get(UIPanel.HomeMainPanel); - var1.subUIManager.Get(UIPanel.SelectRoomPenel).panel_UIHome_BY_MySelectRoomPenel.Show(msg); + + var selectRoomPanel = var1.subUIManager.Get(UIPanel.SelectRoomPenel); + if (selectRoomPanel != null && selectRoomPanel.isMySelectRoom) + selectRoomPanel.panel_UIHome_BY_MySelectRoomPenel.Show(msg); + + else + { + var v = JsonConvert.DeserializeObject>>(msg).arguments[0]; + + + foreach (var item in v) + { + if (item.currentOnlinePlayerCount < item.maxPlayerCount) + { + WebSocketSendList.GetRoomInfo(item.roomId); + break; + //if (item) + //{ + //UIHome_BY_SelectRoomLevelPanel.StartGame(item); + //} + + } + } + } } /// /// 加入房间 room @@ -40,7 +63,7 @@ namespace Assets.MyGame.Scripts.Net /// public static void RoomJoinNotice(string msg) { - string sceneName=""; + string sceneName = ""; UIPanel uIPanel = UIPanel.None; switch (GameManager.Instance.gameData.currGameType) { @@ -56,20 +79,32 @@ namespace Assets.MyGame.Scripts.Net break; case GameType.XJMH: sceneName = "XJMH"; - uIPanel= UIPanel.MainGamePanelXJMH; + uIPanel = UIPanel.MainGamePanelXJMH; break; case GameType.HHWK: break; default: break; } - UIManager.Instance.ShowAsync(uIPanel,UIPanel.HomeMainPanel, msg); + + UIManager.Instance.ShowAsync(uIPanel, UIPanel.HomeMainPanel, msg); //这里 - SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Additive); + var v = SceneManager.GetSceneByName("XJMH"); + if (v.IsValid() && v.isLoaded) + { + + } + else + { + SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Additive); + } + UIManager.Instance.Close(UIPanel.HomeMainPanel); + + } /// - /// 获取房间列表 room + /// 房间列表 room /// /// public static void RoomInfo(string msg) @@ -92,6 +127,46 @@ namespace Assets.MyGame.Scripts.Net { UIManager.Instance.Get(UIPanel.MainGamePanelXJMH).currSitData.goldNum = int.Parse(msg); } + public static void GetRoomInfoResult(string msg) + { + //GameManager.Instance.StartGame();RoomChangeResponse + var roomData = JsonConvert.DeserializeObject>(msg).arguments[0]; + UIHome_BY_SelectRoomLevelPanel.StartGame(roomData); + } + public static void SyncGameDataResult(string msg) + { + var syncGameData = JsonConvert.DeserializeObject>(msg).arguments[0]; + switch (syncGameData.frameType) + { + case FrameDataType.none: + break; + case FrameDataType.rotateTurrect: + EventCenter.Instance.EventTrigger(ConstEventString.SyncGameData_Rotate, syncGameData); + break; + case FrameDataType.fireBullet: + EventCenter.Instance.EventTrigger(ConstEventString.SyncGameData_FireBullet, syncGameData); + break; + case FrameDataType.createFish: + EventCenter.Instance.EventTrigger(ConstEventString.SyncGameData_CreateFish, syncGameData); + break; + case FrameDataType.changeAutoTarget: + EventCenter.Instance.EventTrigger(ConstEventString.SyncGameData_ChangeTargetMonster, syncGameData); + break; + default: + break; + } + + } + public static void LeaveRoomResult(string msg) + { + //GameManager.Instance.StartGame();RoomChangeResponse + var roomData = JsonConvert.DeserializeObject>(msg).arguments[0]; + if (roomData.userId == GameManager.Instance.user.id) + { + WebSocketManager.Instance.Close(SocketType.game); + } + + } } } diff --git a/Assets/MyGame/Scripts/Net/WebSocketSendList_Base.cs b/Assets/MyGame/Scripts/Net/WebSocketSendList_Base.cs index 7695facaf..b17d8e4d9 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketSendList_Base.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketSendList_Base.cs @@ -30,6 +30,7 @@ public partial class WebSocketSendList /// 参数数组（SignalR 要求必须是数组） /// public List arguments; + public WebSocketSendList() { } public WebSocketSendList(string target, params object[] param) { diff --git a/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs b/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs index 4b000a526..cec54d0f2 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketSendList_ChineseChess.cs @@ -28,6 +28,10 @@ public partial class WebSocketSendList { WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"GameReady\",\"invocationId\":\"1\",\"arguments\":[\"" + roomId + "\",\"" + userId + "\"]}"); } + public static void ExitRoomChineseChess(string roomId, string userId) + { + WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"ExitRoom\",\"invocationId\":\"1\",\"arguments\":[\"" + roomId + "\",\"" + userId + "\"]}"); + } public static void GameOperationChineseChess(string roomId,int operateID, string userId) { WebSocketManager.Instance.Send(SocketType.chess, "{\"type\":1,\"target\":\"GameOperation\",\"invocationId\":\"1\",\"arguments\":[\"" + roomId + "\"," + operateID + ",\"" + userId + "\"]}"); diff --git a/Assets/MyGame/Scripts/Net/WebSocketSendList_Fish.cs b/Assets/MyGame/Scripts/Net/WebSocketSendList_Fish.cs index bca61c307..7d8003d5e 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketSendList_Fish.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketSendList_Fish.cs @@ -2,14 +2,13 @@ using Assets.MyGame.Scripts.Net.WebResponses.ChineseChess; using Newtonsoft.Json; using System; +using Unity.VisualScripting; public partial class WebSocketSendList { /// /// 获取房间信息 /// - /// - /// public static void GetRoomListFish(int leave,int district) { WebSocketManager.Instance.Send(SocketType.room, "{\"type\":1,\"target\":\"GetRoomList\",\"invocationId\":\"1\",\"arguments\":[\"" + GameManager.Instance.user.id + "\"," + (int)GameManager.Instance.gameData.currGameType + "," + leave + ","+ district + "]}"); @@ -54,12 +53,21 @@ public partial class WebSocketSendList /// /// /// 房间等级 - public static void JoinRoom(string roomId, string userId, int level) + public static void JoinRoom(string roomId, string userId, int sitID) { - var sendObj = new WebSocketSendList("JoinRoom", roomId, userId, level); + var sendObj = new WebSocketSendList("JoinRoom", roomId, userId, sitID); WebSocketManager.Instance.Send(SocketType.game, JsonConvert.SerializeObject(sendObj)); } /// + /// 获取房间信息 + /// + /// 房间id + public static void GetRoomInfo(string roomId) + { + var sendObj = new WebSocketSendList("GetRoomInfo", roomId); + WebSocketManager.Instance.Send(SocketType.room, JsonConvert.SerializeObject(sendObj)); + } + /// /// 使用道具 /// /// @@ -92,4 +100,22 @@ public partial class WebSocketSendList var sendObj = new WebSocketSendList("ChangeGunMultiple", roomId, userId, multiple); WebSocketManager.Instance.Send(SocketType.game, JsonConvert.SerializeObject(sendObj)); } + + /// + /// 数据同步 + /// + public static void SyncGameData(object obj) + { + WebSocketSendList sendObj = new WebSocketSendList + { + type = 1, + invocationId = "1", + target = "SyncGameData", + arguments = new System.Collections.Generic.List() + }; + + sendObj.arguments.Add(GameManager.Instance.gameData.currRoomData.roomId); + sendObj.arguments.Add(obj); + WebSocketManager.Instance.Send(SocketType.game, JsonConvert.SerializeObject(sendObj)); + } } diff --git a/Assets/MyGame/Scripts/Turret/SitPosData.cs b/Assets/MyGame/Scripts/Turret/SitPosData.cs index 737d5cbb4..2b4d5f670 100644 --- a/Assets/MyGame/Scripts/Turret/SitPosData.cs +++ b/Assets/MyGame/Scripts/Turret/SitPosData.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using TMPro; using UnityEngine; +using UnityEngine.UI; public class SitPosData : MonoBehaviour { @@ -13,14 +14,17 @@ public class SitPosData : MonoBehaviour public int posID; public TextMeshProUGUI tMP_TurretConsumeNum; public TextMeshProUGUI tMP_GoldNum; - public int goldNum; - public int consumeGoldNum; + public long goldNum; + public long consumeGoldNum; public Dictionary dic_Turrets=new Dictionary(); public List list_Turrets=new List(); public int currentTurretIndex = 0; public string currentTurretID = ""; public TurretData currentTurret; + public MonsterContral monCotl_Lock; + public bool isLock=false; + public SpriteRenderer lockFX; public SkeletonGraphic skeletonAnimation; public Transform tra_CurrTurret; @@ -73,7 +77,7 @@ public class SitPosData : MonoBehaviour } public bool ConsumeGold(int bl=1) { - int temp = goldNum - consumeGoldNum*bl; + long temp = goldNum - consumeGoldNum*bl; if (temp > 0) { goldNum = temp; diff --git a/Assets/MyGame/aa/UI/AllUIManager.asset b/Assets/MyGame/aa/UI/AllUIManager.asset index 72bc7e86c..5efe79289 100644 --- a/Assets/MyGame/aa/UI/AllUIManager.asset +++ b/Assets/MyGame/aa/UI/AllUIManager.asset @@ -24,7 +24,7 @@ MonoBehaviour: address: Assets/MyGame/aa/UI/Game/GameMainPanel_Default.prefab - name: "\u661F\u9645\u8FF7\u822A" type: 6 - address: Assets/MyGame/aa/UI/Game/GameMainPanelXJMH.prefab + address: Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab - name: "\u4E2D\u56FD\u8C61\u68CB" type: 5 address: Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab index 9f165bf14..6aaffa28b 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/3GameMain.prefab @@ -75,6 +75,127 @@ 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 @@ -375,6 +496,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1359599371492523718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4999502501446615364} + - component: {fileID: 4358028137315064583} + - component: {fileID: 1013555321632293526} + 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 &4999502501446615364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359599371492523718} + 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: 2961143380359910492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 232, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4358028137315064583 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359599371492523718} + m_CullTransparentMesh: 1 +--- !u!114 &1013555321632293526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359599371492523718} + 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: "\u7528\u6237" + 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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 &1364566693920985957 GameObject: m_ObjectHideFlags: 0 @@ -912,7 +1168,7 @@ GameObject: - component: {fileID: 7044938121411102743} - component: {fileID: 3573696294247399736} m_Layer: 5 - m_Name: "\u7528\u6237\u540D\u79F0\u4E03\u4E2A\u5B57" + m_Name: "\u7528\u6237\u540D\u79F0\u4E03\u4E2A\u5B57_bottom" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -929,7 +1185,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5150823049174531304} + - {fileID: 3499282399187937205} m_Father: {fileID: 2713217087351076567} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -952,7 +1210,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1667789698084997696} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -1200,6 +1458,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1888041362037920152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5150823049174531304} + - component: {fileID: 7284867517000523330} + - component: {fileID: 8524192704910942279} + 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 &5150823049174531304 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888041362037920152} + 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: 3533627798997498362} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 232, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7284867517000523330 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888041362037920152} + m_CullTransparentMesh: 1 +--- !u!114 &8524192704910942279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888041362037920152} + 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: "\u7528\u6237" + 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + 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 &1906416241141429318 GameObject: m_ObjectHideFlags: 0 @@ -1497,11 +1890,9 @@ RectTransform: - {fileID: 2789841380025986732} - {fileID: 3463507709209608574} - {fileID: 3468933965960448748} - - {fileID: 1637882535020254262} - {fileID: 6084628264504239177} - {fileID: 2961143380359910492} - {fileID: 3665865101359935520} - - {fileID: 1239831875709247311} - {fileID: 7223935503860211034} - {fileID: 3533627798997498362} - {fileID: 1847413125192888510} @@ -1516,6 +1907,7 @@ RectTransform: - {fileID: 7885935478483656195} - {fileID: 1311275167813292198} - {fileID: 2724128015881410653} + - {fileID: 7362718401641258334} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1577,6 +1969,13 @@ MonoBehaviour: subPanelParent: {fileID: 2724128015881410653} btn_QiuHe: {fileID: 2065631752728168651} btn_RenShu: {fileID: 4922536534435888871} + btn_FanHuiDaTing: {fileID: 5398992926565514206} + tmp_Name_Bottom: {fileID: 8524192704910942279} + tmp_CoinCount_Bottom: {fileID: 9063371640914375294} + img_Title_Bottom: {fileID: 5347314151497148045} + tmp_Name_Top: {fileID: 1013555321632293526} + tmp_CoinCount_Top: {fileID: 806666046055881203} + img_Title_Top: {fileID: 8418575104481079484} --- !u!1 &2918223471479292747 GameObject: m_ObjectHideFlags: 0 @@ -1589,7 +1988,7 @@ GameObject: - component: {fileID: 7428510744622053848} - component: {fileID: 7417078548692058577} m_Layer: 5 - m_Name: "-h-\u7528\u6237\u540D\u79F0\u4E03\u4E2A\u5B57" + m_Name: "-h-\u7528\u6237\u540D\u79F0\u4E03\u4E2A\u5B57_Top" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1606,7 +2005,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4999502501446615364} + - {fileID: 7621271609928269875} m_Father: {fileID: 2713217087351076567} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1629,7 +2030,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2918223471479292747} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -1802,6 +2203,141 @@ 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 @@ -2673,6 +3209,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4893561736027568818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7621271609928269875} + - component: {fileID: 7965014199416689983} + - component: {fileID: 806666046055881203} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7621271609928269875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4893561736027568818} + 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: 2961143380359910492} + 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: -44.6} + m_SizeDelta: {x: 232, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7965014199416689983 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4893561736027568818} + m_CullTransparentMesh: 1 +--- !u!114 &806666046055881203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4893561736027568818} + 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: "\u7528\u623712341564221" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6a4ac15267282aa4790bdbb1dbbd6a3a, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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 &5029683441473960966 GameObject: m_ObjectHideFlags: 0 @@ -2933,6 +3603,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5511843396542321924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3499282399187937205} + - component: {fileID: 7502778774234142073} + - component: {fileID: 9063371640914375294} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3499282399187937205 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5511843396542321924} + 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: 3533627798997498362} + 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: -48.4} + m_SizeDelta: {x: 232, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7502778774234142073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5511843396542321924} + m_CullTransparentMesh: 1 +--- !u!114 &9063371640914375294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5511843396542321924} + 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: "\u7528\u623712341564221" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6a4ac15267282aa4790bdbb1dbbd6a3a, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + 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 &5548342517636900212 GameObject: m_ObjectHideFlags: 0 @@ -2944,8 +3748,9 @@ GameObject: - component: {fileID: 3468933965960448748} - component: {fileID: 2842549186630650099} - component: {fileID: 3174917842662520563} + - component: {fileID: 457508960845642307} m_Layer: 5 - m_Name: "-h-\u692D\u5706 1" + m_Name: AvatarNG_Top m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2962,7 +3767,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1637882535020254262} m_Father: {fileID: 2713217087351076567} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3008,6 +3814,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &457508960845642307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5548342517636900212} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &5580335866429680540 GameObject: m_ObjectHideFlags: 0 @@ -3515,8 +4334,9 @@ GameObject: - component: {fileID: 3665865101359935520} - component: {fileID: 8080257264165660694} - component: {fileID: 8676495440637979647} + - component: {fileID: 3917042660446694116} m_Layer: 5 - m_Name: "\u692D\u5706 1" + m_Name: AvatarBG_Bottom m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3533,7 +4353,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1239831875709247311} m_Father: {fileID: 2713217087351076567} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3579,6 +4400,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3917042660446694116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6360824618666476259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &6735838485900340557 GameObject: m_ObjectHideFlags: 0 @@ -4359,11 +5193,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2713217087351076567} + m_Father: {fileID: 3468933965960448748} 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: -313, y: 522.5} + m_AnchoredPosition: {x: 0.5, y: -0.5} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7032767832924623789 @@ -4809,11 +5643,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2713217087351076567} + m_Father: {fileID: 3665865101359935520} 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: 317.99994, y: -476.5} + m_AnchoredPosition: {x: 4.5, y: -4.5} m_SizeDelta: {x: 98, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2303792952554723880 diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs index 98538d73d..3266de370 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs @@ -1,7 +1,9 @@ using Assets.MyGame.Scripts.Net; using Newtonsoft.Json; +using System; using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; using UnityEngine.UI; using static Assets.MyGame.Scripts.Net.WebResponses.ChineseChess.ChineseChessGameClassList; @@ -18,35 +20,49 @@ public class ChineseChessMainPanel : GameMainPanel_Base public Button btn_RenShu; public ChessGameRoom roomData; public static Dictionary dic_RoomData=new Dictionary(); + public Button btn_FanHuiDaTing; + [Header("Bottom")] + public TextMeshProUGUI tmp_Name_Bottom; + public TextMeshProUGUI tmp_CoinCount_Bottom; + public Image img_Title_Bottom; + [Header("Top")] + public TextMeshProUGUI tmp_Name_Top; + public TextMeshProUGUI tmp_CoinCount_Top; + public Image img_Title_Top; + public void StartGame(string msg) { - + var va = JsonConvert.DeserializeObject>(msg.ToString()); ChessGameRoom chessGameRoom = va.arguments[0]; + //UpdateUserData(chessGameRoom); //这里要提前设置房间头像金币信息 switch (chessGameRoom.users.Count) { case 1: { //等待加入 文字显示 - + tmp_Name_Top.text = ""; + tmp_CoinCount_Top.text = "金币：" + ""; + img_Title_Top.gameObject.SetActive(false); } break; case 2: { + img_Title_Top.gameObject.SetActive(true); foreach (var item in chessGameRoom.users) { - if (item.userId==GameManager.Instance.user.id) + if (item.userId == GameManager.Instance.user.id) { - if (item.type==2) + if (item.type == 2) { - subUIManager.ShowAsync(UIPanel.ZGXQSelectCoin,chessGameRoom); + subUIManager.ShowAsync(UIPanel.ZGXQSelectCoin, chessGameRoom); } } } //subUIManager.ShowAsync(UIPanel.) - + } break; default: @@ -55,10 +71,39 @@ public class ChineseChessMainPanel : GameMainPanel_Base } + + public void UpdateUserData(ChessGameRoom chessGameRoom) + { + foreach (var item in chessGameRoom.users) + { + if (item.userId == GameManager.Instance.user.id) + { + tmp_Name_Bottom.text = item.userName; + tmp_CoinCount_Bottom.text = "金币：" + item.gold.ToString(); + StartCoroutine(item.DownTexture2d((t2d) => + { + img_Title_Bottom.sprite = Sprite.Create(t2d, new Rect(0, 0, 100, 100), new Vector2(0.5f, 0.5f)); + })); + } + else + { + tmp_Name_Top.text = item.userName; + tmp_CoinCount_Top.text = "金币：" + item.gold.ToString(); + StartCoroutine(item.DownTexture2d((t2d) => + { + img_Title_Top.sprite = Sprite.Create(t2d, new Rect(0, 0, 100, 100), new Vector2(0.5f, 0.5f)); + })); + } + } + } + public override void Awake() { base.Awake(); - + btn_FanHuiDaTing.onClick.AddListener(() => + { + UIManager.Instance.Close(UIPanel.MainGamePanelZGXQ); + }); } protected override void OnShow(object args = null) { @@ -89,12 +134,12 @@ public class ChineseChessMainPanel : GameMainPanel_Base }); btn_RenShu.onClick.AddListener(() => { - WebSocketSendList.GameOperationChineseChess(roomData.roomId, 2, GameManager.Instance.user.id); - //subUIManager.ShowAsync(UIPanel.ZGXQHint, new HintData - //{ - // roomData = roomData, - // hintType = 2 - //}); + //WebSocketSendList.GameOperationChineseChess(roomData.roomId, 2, GameManager.Instance.user.id); + subUIManager.ShowAsync(UIPanel.ZGXQHint, new HintData + { + roomData = roomData, + hintType = 2 + }); }); } @@ -105,6 +150,7 @@ public class ChineseChessMainPanel : GameMainPanel_Base protected override void OnHide() { base.OnHide(); + WebSocketManager.Instance.Close(SocketType.chess); Screen.orientation = ScreenOrientation.LandscapeLeft; } } diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs index b77c5937f..2af641ff0 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs @@ -113,7 +113,7 @@ public class UIChineseChessDistrict : SubUIBase string roomID= item.roomId; ChineseChessMainPanel.dic_RoomData[roomID] = item; - + var tran=itemListDic[roomID]; var slider = tran.transform.GetChild(1).GetComponent(); int allPlayerCount = item.users.Count; diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessHint.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessHint.cs index 3fe65686a..c279a287c 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessHint.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessHint.cs @@ -41,6 +41,7 @@ public class UIChineseChessHint : SubUIBase } TongYi.onClick.AddListener(() => { + //WebSocketSendList.GameOperationChineseChess(v.roomData.roomId, 2, GameManager.Instance.user.id); WebSocketSendList.EndGameChineseChess(v.roomData.roomId,targetID); uIManager.Hide(UIPanel.ZGXQHint); }); diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessRoomExplain.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessRoomExplain.cs index 077a28bd2..4f200daa5 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessRoomExplain.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessRoomExplain.cs @@ -16,11 +16,7 @@ public class UIChineseChessRoomExplain : SubUIBase public override void Awake() { - btn_Close.onClick.AddListener(() => - { - uIManager.CloseAll(); - WebSocketSendList.GetRoomListChineseChess(1); - }); + } protected override void OnShow(object args = null) { @@ -38,6 +34,14 @@ public class UIChineseChessRoomExplain : SubUIBase WebSocketSendList.GameReadyChineseChess(v.roomId,GameManager.Instance.user.id); uIManager.Close(UIPanel.ZGXQGameExplain); }); + btn_Close.onClick.RemoveAllListeners(); + btn_Close.onClick.AddListener(() => + { + uIManager.CloseAll(); + + WebSocketSendList.ExitRoomChineseChess(v.roomId, GameManager.Instance.user.id); + + }); } } diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab index caa0ea748..3fe2eaf4c 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &89818527304225816 +--- !u!1 &2174512754680754 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,50 +8,97 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2754508811797923462} - - component: {fileID: 6983728502550232899} - - component: {fileID: 3697375592802698586} - m_Layer: 5 - m_Name: Down + - component: {fileID: 6052845187229679382} + - component: {fileID: 6644560534361968733} + m_Layer: 0 + m_Name: SkeletonGraphic (lvptpaotai_2) (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2754508811797923462 +--- !u!224 &6052845187229679382 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89818527304225816} + m_GameObject: {fileID: 2174512754680754} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 9154730181581589643} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6057432198244768730} + - {fileID: 4732517949855444066} + m_Father: {fileID: 9096498857142868871} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 259.5, y: 59.5} - m_SizeDelta: {x: 34, y: 34} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6983728502550232899 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.37548828, y: -3.8} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.49956542, y: -0.053092174} +--- !u!222 &6644560534361968733 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89818527304225816} + m_GameObject: {fileID: 2174512754680754} m_CullTransparentMesh: 1 ---- !u!114 &3697375592802698586 +--- !u!1 &201989078447231216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1144585611597707145} + - component: {fileID: 4913870692741597114} + - component: {fileID: 2736556996446551711} + - component: {fileID: 2895175370879767809} + m_Layer: 5 + m_Name: Image (5) + m_TagString: ChangeTurret + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1144585611597707145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201989078447231216} + 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: 6739341556210570986} + 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: 155, y: -63} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4913870692741597114 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201989078447231216} + m_CullTransparentMesh: 1 +--- !u!114 &2736556996446551711 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89818527304225816} + m_GameObject: {fileID: 201989078447231216} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -65,7 +112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c20a60fd46cacd84b9ac701379d42798, type: 3} + m_Sprite: {fileID: 21300000, guid: c5452570e59bfe349980c1ee34917985, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -75,7 +122,75 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &143678611026852357 +--- !u!114 &2895175370879767809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201989078447231216} + 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: 2736556996446551711} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2190378019845123665} + m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp + m_MethodName: ChangeTurret + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6962888877589149824} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &235291531088246358 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -83,44 +198,74 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 628983271918820405} - - component: {fileID: 9113383888492388356} - m_Layer: 0 - m_Name: SkeletonGraphic (vippaotai01_2) (1) - m_TagString: Untagged + - component: {fileID: 525587739152206726} + - component: {fileID: 453496260701531243} + - component: {fileID: 1952643252244381103} + m_Layer: 5 + m_Name: Image + m_TagString: ChangeTurret m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &628983271918820405 +--- !u!224 &525587739152206726 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143678611026852357} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 235291531088246358} + 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: 7699774046271177132} - m_Father: {fileID: 9179323081622669638} + m_Children: [] + m_Father: {fileID: 3359937958531653490} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.1599895, y: 61.224987} - m_SizeDelta: {x: 90.5, y: 96.25001} - m_Pivot: {x: 0.4916022, y: -0.13818176} ---- !u!222 &9113383888492388356 + m_AnchoredPosition: {x: -60.36, y: -33.167} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &453496260701531243 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143678611026852357} + m_GameObject: {fileID: 235291531088246358} m_CullTransparentMesh: 1 ---- !u!1 &479873841549994440 +--- !u!114 &1952643252244381103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235291531088246358} + 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} + 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!1 &285695714867914389 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -128,43 +273,234 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 252303370026750404} - - component: {fileID: 5343819284611102583} + - component: {fileID: 2324713258801040471} m_Layer: 0 - m_Name: SkeletonGraphic (lvptpaotai_2) (1) + m_Name: Bullit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &252303370026750404 +--- !u!224 &2324713258801040471 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479873841549994440} + m_GameObject: {fileID: 285695714867914389} 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: 3649188984890311904} - m_Father: {fileID: 7451594843209618765} + m_Children: [] + m_Father: {fileID: 77188773409426491} 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.37548828, y: -3.8} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.49956542, y: -0.053092174} ---- !u!222 &5343819284611102583 + m_AnchoredPosition: {x: 0, y: -25.160748} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &435114671136589010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1034521838101397786} + - component: {fileID: 4042406576183889496} + - component: {fileID: 6902365978320017531} + m_Layer: 0 + m_Name: SkeletonGraphic (huangjinpaotai_2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1034521838101397786 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 435114671136589010} + 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: 1 + m_Children: [] + m_Father: {fileID: 77188773409426491} + 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.46611023, y: -121.91077} + m_SizeDelta: {x: 96.048904, y: 108.64001} + m_Pivot: {x: 0.50485283, y: -0.08035717} +--- !u!222 &4042406576183889496 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479873841549994440} + m_GameObject: {fileID: 435114671136589010} m_CullTransparentMesh: 1 +--- !u!114 &6902365978320017531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 435114671136589010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 60f94d1b1ab88874cb1d9875d2f5d921, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: out + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!1 &690902330177664992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039827835170161544} + - component: {fileID: 8308623193860637944} + - component: {fileID: 8206571186635148660} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2039827835170161544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690902330177664992} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0054266, y: 1.0054266, z: 1.0054266} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2820258039669297249} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 127.99997, y: 128.00003} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8308623193860637944 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690902330177664992} + m_CullTransparentMesh: 1 +--- !u!114 &8206571186635148660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690902330177664992} + 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: 39d59e5b27a4ace499645eac72d95501, 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 &730839532854564297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1858001482388156700} + m_Layer: 0 + m_Name: Bullit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1858001482388156700 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730839532854564297} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0215431, y: 1.0215431, z: 1.0215431} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2002625151011023770} + 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.4870249, y: -43.242477} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &751578813376766371 GameObject: m_ObjectHideFlags: 0 @@ -200,153 +536,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -25.160748} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &795262737652541646 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9154730181581589643} - - component: {fileID: 7648421259892254049} - m_Layer: 5 - m_Name: Turret_Right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9154730181581589643 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795262737652541646} - 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: 9179323081622669638} - - {fileID: 7451594843209618765} - - {fileID: 3384422852841419605} - - {fileID: 9033931018099822141} - - {fileID: 7233525534935675840} - - {fileID: 2754508811797923462} - m_Father: {fileID: 245637205031072731} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 476, y: -281.78986} - m_SizeDelta: {x: -811.868, y: -563.5797} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7648421259892254049 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795262737652541646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 16cfaab69e1fa404dbb8432276bd7537, type: 3} - m_Name: - m_EditorClassIdentifier: - user: - id: - isDelete: 0 - createInfo: - userId: - userName: - optionTime: 0 - realName: - realName: - idCard: - safeBox: - amount: 0 - password: - saveTime: 0 - sign: - isSign: 0 - signTime: 0 - cannonList: [] - cannonUsing: - number: - name: - desc: - imageUrl: - type: 0 - level: 0 - isTrial: 0 - trialEndTime: 0 - wingUsing: - number: - name: - desc: - imageUrl: - type: 0 - level: 0 - isTrial: 0 - trialEndTime: 0 - wingList: [] - godWarUsing: - number: - name: - desc: - imageUrl: - type: 0 - level: 0 - isTrial: 0 - trialEndTime: 0 - godWarList: [] - props: [] - assets: - diamond: 0 - gold: 0 - level: 0 - exp: 0 - vipSignInAdd: 0 - vipLevel: 0 - vipGift: - isVipDayGift: 0 - userCardInAdd: 0 - userCardLevel: 0 - userCardEndTime: 0 - isUserCardDayGift: 0 - userCardGift: - createTime: 0 - banInfo: - isBan: 0 - banTime: 0 - banReason: - banDays: 0 - banEndTime: 0 - static: - lastLoginTime: 0 - lastLoginIp: - onlineTime: 0 - gameTime: 0 - roomNumber: - totalRecharge: 0 - totalConsumeGold: 0 - totalConsumeDiamond: 0 - reliefGoldCount: 0 - token: - posID: 2 - tMP_TurretConsumeNum: {fileID: 0} - tMP_GoldNum: {fileID: 0} - goldNum: 0 - consumeGoldNum: 0 - list_Turrets: [] - currentTurretIndex: 0 - currentTurretID: 0 - currentTurret: {fileID: 0} - skeletonAnimation: {fileID: 0} - tra_CurrTurret: {fileID: 0} - tra_CurrFly: {fileID: 0} - changeTurretList: {fileID: 0} --- !u!1 &819733747792034216 GameObject: m_ObjectHideFlags: 0 @@ -690,13 +879,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -895,6 +1092,218 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1176851849062714383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1136845146730457847} + - component: {fileID: 520078559182192940} + - component: {fileID: 1671184689300260061} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1136845146730457847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176851849062714383} + 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: 340013344488207026} + - {fileID: 2586931238896229995} + m_Father: {fileID: 3359937958531653490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 345.4527, y: 35.64972} + m_SizeDelta: {x: 157, y: 51} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &520078559182192940 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176851849062714383} + m_CullTransparentMesh: 1 +--- !u!114 &1671184689300260061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176851849062714383} + 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: 9524631ad3d57cc4e9491219439cdf12, 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 &1284106165883096135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8223402693406750132} + - component: {fileID: 2329023314690343396} + - component: {fileID: 8649071722458985481} + m_Layer: 5 + m_Name: "\u6211\u5728\u8FD9" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8223402693406750132 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284106165883096135} + 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: 3856749598235783551} + 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: 184} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2329023314690343396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284106165883096135} + m_CullTransparentMesh: 1 +--- !u!114 &8649071722458985481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284106165883096135} + 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: "\u6211\u5728\u8FD9" + 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: 4282056446 + m_fontColor: {r: 0.9960785, g: 0.9960785, b: 0.227451, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1323894011039356363 GameObject: m_ObjectHideFlags: 0 @@ -1149,6 +1558,52 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1501128336163249401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2002625151011023770} + - component: {fileID: 6092585118496572638} + m_Layer: 0 + m_Name: SkeletonGraphic (vippaotai01_2) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2002625151011023770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501128336163249401} + 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: 905171006867444295} + - {fileID: 1858001482388156700} + m_Father: {fileID: 2512914949431483257} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.1599895, y: 61.224987} + m_SizeDelta: {x: 90.5, y: 96.25001} + m_Pivot: {x: 0.4916022, y: -0.13818176} +--- !u!222 &6092585118496572638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501128336163249401} + m_CullTransparentMesh: 1 --- !u!1 &1550463394708406589 GameObject: m_ObjectHideFlags: 0 @@ -1293,7 +1748,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &1929225623578170582 +--- !u!1 &1599925866186702259 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1301,56 +1756,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3649188984890311904} - - component: {fileID: 2284666325168912175} - - component: {fileID: 1440876429597954849} - m_Layer: 0 - m_Name: SkeletonGraphic (lvptpaotai_2) - m_TagString: Untagged + - component: {fileID: 5156679207977476091} + - component: {fileID: 3062892748986293692} + - component: {fileID: 8504982704940978569} + - component: {fileID: 5970506386740647798} + m_Layer: 5 + m_Name: Image (2) + m_TagString: ChangeTurret m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3649188984890311904 +--- !u!224 &5156679207977476091 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1929225623578170582} + m_GameObject: {fileID: 1599925866186702259} 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: 252303370026750404} + m_Father: {fileID: 6739341556210570986} 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: -29.8} - m_SizeDelta: {x: 96.186035, y: 91.746864} - m_Pivot: {x: 0.49956542, y: -0.053092174} ---- !u!222 &2284666325168912175 + m_AnchoredPosition: {x: -146, y: -63} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3062892748986293692 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1929225623578170582} + m_GameObject: {fileID: 1599925866186702259} m_CullTransparentMesh: 1 ---- !u!114 &1440876429597954849 +--- !u!114 &8504982704940978569 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1929225623578170582} + m_GameObject: {fileID: 1599925866186702259} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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} @@ -1358,24 +1814,84 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 782f605c06be63b46807dd6d8f189de4, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: out - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 + m_Sprite: {fileID: 21300000, guid: 852e62a72e5156f4f873289b9c6ebe39, 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 &5970506386740647798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599925866186702259} + 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: 8504982704940978569} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2190378019845123665} + m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp + m_MethodName: ChangeTurret + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6962888877589149824} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1951994036281408629 GameObject: m_ObjectHideFlags: 0 @@ -1587,13 +2103,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -1618,6 +2142,121 @@ MonoBehaviour: type: 3} bulletPrefab_Two: {fileID: 1049455767047195, guid: df3c50e610b026549b73a6c4889a404e, type: 3} +--- !u!1 &2095981215852264912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2512914949431483257} + - component: {fileID: 3550951216142337492} + - component: {fileID: 7147575032780827795} + - component: {fileID: 9190286095546435522} + m_Layer: 0 + m_Name: SkeletonGraphic_VIP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2512914949431483257 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095981215852264912} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2002625151011023770} + - {fileID: 8350702855646743217} + m_Father: {fileID: 3359937958531653490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 343, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3550951216142337492 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095981215852264912} + m_CullTransparentMesh: 1 +--- !u!114 &7147575032780827795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095981215852264912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 70f9119ea94db6341a7851e42aa06321, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: out + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!114 &9190286095546435522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095981215852264912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a0bd2a3126c052438fc0291e214e0a0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: 4 + turretLevel: 0 + setPosData: {fileID: 0} + btn_AddTurretNum: {fileID: 0} + btn_SubTractTurretNum: {fileID: 0} + bulletPrefab: {fileID: 1985037619002984, guid: a59ca1da18fb6c84ba2d1cbdc12e72f5, + type: 3} + bulletPrefab_Two: {fileID: 1373092808597860, guid: 91df00438f6dea048b65ce7fba715230, + type: 3} --- !u!1 &2242422221712062153 GameObject: m_ObjectHideFlags: 0 @@ -1691,91 +2330,24 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 ---- !u!1 &2287782594484664576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7233525534935675840} - - component: {fileID: 5647829429991055940} - - component: {fileID: 2245028079534539251} - m_Layer: 5 - m_Name: Up - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7233525534935675840 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2287782594484664576} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 9154730181581589643} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 460, y: 59.5} - m_SizeDelta: {x: 34, y: 34} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5647829429991055940 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2287782594484664576} - m_CullTransparentMesh: 1 ---- !u!114 &2245028079534539251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2287782594484664576} - 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: 2935bd2bb6b2b564fa37639a534c9039, 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 &2301837234143825517 GameObject: m_ObjectHideFlags: 0 @@ -2030,6 +2602,97 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &2620434211762408407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8350702855646743217} + - component: {fileID: 2163577935126863119} + - component: {fileID: 6147714501227148893} + m_Layer: 0 + m_Name: SkeletonGraphic (vipfeiji01) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8350702855646743217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2620434211762408407} + 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: 2512914949431483257} + 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: 67.5} + m_SizeDelta: {x: 120.002945, y: 85.749535} + m_Pivot: {x: 0.504962, y: 0.48887116} +--- !u!222 &2163577935126863119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2620434211762408407} + m_CullTransparentMesh: 1 +--- !u!114 &6147714501227148893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2620434211762408407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 5e34881084857044dacbf82e9c780dc6, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: trans + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 --- !u!1 &2698471221761360252 GameObject: m_ObjectHideFlags: 0 @@ -2176,51 +2839,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &2741539385851442639 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1642361589275851851} - - component: {fileID: 596421623819182596} - m_Layer: 0 - m_Name: SkeletonGraphic (huangjinpaotai_2) (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1642361589275851851 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2741539385851442639} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6769106, y: 0.6769106, z: 0.6769106} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 6762869871359625580} - m_Father: {fileID: 9033931018099822141} - 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.026721954, y: -0.9000015} - m_SizeDelta: {x: 96.048904, y: 108.64001} - m_Pivot: {x: 0.50485283, y: -0.08035717} ---- !u!222 &596421623819182596 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2741539385851442639} - m_CullTransparentMesh: 1 --- !u!1 &2755753991937129006 GameObject: m_ObjectHideFlags: 0 @@ -2395,8 +3013,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8019622945320605939} - - {fileID: 9154730181581589643} - - {fileID: 1600270965213060995} + - {fileID: 3359937958531653490} - {fileID: 38992651813133378} - {fileID: 6665898966579201677} - {fileID: 755472782897628008} @@ -2418,7 +3035,7 @@ MonoBehaviour: m_GameObject: {fileID: 2856141562549588388} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01ac759495b510f4db82b6e1ee724737, type: 3} + m_Script: {fileID: 11500000, guid: 6dec7b077ca94844c8c1360f71e7aa58, type: 3} m_Name: m_EditorClassIdentifier: panelAddressConfig: {fileID: 11400000, guid: bccf4cf68d6a2d7448a271615a81febb, type: 2} @@ -2444,10 +3061,10 @@ MonoBehaviour: LockFX: {fileID: 7552227473400021725} list_Sits: - {fileID: 5506378243937910797} - - {fileID: 7648421259892254049} + - {fileID: 2190378019845123665} currSitData: {fileID: 0} - attackTime: 0.2 - bullet_Test: {fileID: 1207119993371665, guid: 154a9136554cd844fbf3ea8599ffd24a, + attackTime: 0.5 + bullet_Test: {fileID: 1166920474713197, guid: 279ce3d544e4bc34097fc18fccb2ceac, type: 3} bulletParent: {fileID: 5156217227802463099} toggle_Shuang: {fileID: 6788830007509759241} @@ -2497,6 +3114,163 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3195561058214679262} m_CullTransparentMesh: 1 +--- !u!1 &3411055791458452147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3359937958531653490} + - component: {fileID: 2190378019845123665} + m_Layer: 5 + m_Name: Turret_Left (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3359937958531653490 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3411055791458452147} + 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: 2512914949431483257} + - {fileID: 9096498857142868871} + - {fileID: 5738415672704955863} + - {fileID: 6883970546238051001} + - {fileID: 1136845146730457847} + - {fileID: 525587739152206726} + - {fileID: 6739341556210570986} + - {fileID: 3856749598235783551} + - {fileID: 3878561808292663175} + m_Father: {fileID: 245637205031072731} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 475.99988, y: -281.78986} + m_SizeDelta: {x: -811.868, y: -563.5797} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2190378019845123665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3411055791458452147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16cfaab69e1fa404dbb8432276bd7537, type: 3} + m_Name: + m_EditorClassIdentifier: + user: + id: + isDelete: 0 + createInfo: + userId: + userName: + optionTime: 0 + realName: + realName: + idCard: + safeBox: + amount: 0 + password: + saveTime: 0 + sign: + isSign: 0 + signTime: 0 + cannonList: [] + cannonUsing: + number: + name: + desc: + imageUrl: + type: 0 + level: 0 + isTrial: 0 + trialEndTime: 0 + wingUsing: + number: + name: + desc: + imageUrl: + type: 0 + level: 0 + isTrial: 0 + trialEndTime: 0 + wingList: [] + godWarUsing: + number: + name: + desc: + imageUrl: + type: 0 + level: 0 + isTrial: 0 + trialEndTime: 0 + godWarList: [] + props: [] + assets: + diamond: 0 + gold: 0 + level: 0 + exp: 0 + vipSignInAdd: 0 + vipLevel: 0 + vipGift: + isVipDayGift: 0 + userCardInAdd: 0 + userCardLevel: 0 + userCardEndTime: 0 + isUserCardDayGift: 0 + userCardGift: + createTime: 0 + banInfo: + isBan: 0 + banTime: 0 + banReason: + banDays: 0 + banEndTime: 0 + static: + lastLoginTime: 0 + lastLoginIp: + onlineTime: 0 + gameTime: 0 + roomNumber: + totalRecharge: 0 + totalConsumeGold: 0 + totalConsumeDiamond: 0 + reliefGoldCount: 0 + token: + posID: 1 + tMP_TurretConsumeNum: {fileID: 8977871219812629068} + tMP_GoldNum: {fileID: 1136350287412920581} + goldNum: 0 + consumeGoldNum: 0 + list_Turrets: + - {fileID: 9190286095546435522} + - {fileID: 4547482054913003313} + - {fileID: 5925899117660190050} + - {fileID: 8734647136834543879} + currentTurretIndex: 0 + currentTurretID: 0 + currentTurret: {fileID: 0} + monCotl_Lock: {fileID: 0} + isLock: 0 + lockFX: {fileID: 5666264937703860453} + skeletonAnimation: {fileID: 0} + tra_CurrTurret: {fileID: 0} + tra_CurrFly: {fileID: 0} + changeTurretList: {fileID: 6962888877589149824} --- !u!1 &3415112906325044266 GameObject: m_ObjectHideFlags: 0 @@ -2646,6 +3420,90 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3600415129859738056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3878561808292663175} + - component: {fileID: 5666264937703860453} + m_Layer: 0 + m_Name: paotai09 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3878561808292663175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3600415129859738056} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1291.1226, y: -91.88049, z: 0} + m_LocalScale: {x: 2.4365902, y: 2.4365902, z: 2.4365902} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3359937958531653490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5666264937703860453 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3600415129859738056} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1000 + m_Sprite: {fileID: 21300000, guid: 29fa531e4ead29e45b09624ca4fd5c0c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3661720747738990924 GameObject: m_ObjectHideFlags: 0 @@ -2724,13 +3582,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -2755,6 +3621,97 @@ MonoBehaviour: type: 3} bulletPrefab_Two: {fileID: 1177632837766673, guid: ca64d0abc6450584c839b6b8ca03910a, type: 3} +--- !u!1 &3705345917006562772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5104424221228601176} + - component: {fileID: 4235606712415991604} + - component: {fileID: 7999196167398382079} + m_Layer: 0 + m_Name: SkeletonGraphic (lanptpaotai_2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5104424221228601176 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3705345917006562772} + 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: 1277747926479178504} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.5395966, y: -102.351364} + m_SizeDelta: {x: 86.49503, y: 89.74921} + m_Pivot: {x: 0.4822003, y: -0.07243594} +--- !u!222 &4235606712415991604 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3705345917006562772} + m_CullTransparentMesh: 1 +--- !u!114 &7999196167398382079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3705345917006562772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: caa5cf5c58195524fafd0a8639407fac, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: out + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 --- !u!1 &3712232115700564997 GameObject: m_ObjectHideFlags: 0 @@ -2831,13 +3788,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -2862,89 +3827,6 @@ MonoBehaviour: type: 3} bulletPrefab_Two: {fileID: 1373092808597860, guid: 91df00438f6dea048b65ce7fba715230, type: 3} ---- !u!1 &3749132640693809487 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2401569024815881289} - - component: {fileID: 6626540851797416947} - - component: {fileID: 4114131579314900641} - m_Layer: 0 - m_Name: SkeletonGraphic (vipfeiji01) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2401569024815881289 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3749132640693809487} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9179323081622669638} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 67.5} - m_SizeDelta: {x: 120.002945, y: 85.749535} - m_Pivot: {x: 0.504962, y: 0.48887116} ---- !u!222 &6626540851797416947 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3749132640693809487} - m_CullTransparentMesh: 1 ---- !u!114 &4114131579314900641 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3749132640693809487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} - 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: [] - skeletonDataAsset: {fileID: 11400000, guid: 5e34881084857044dacbf82e9c780dc6, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: trans - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &3886340901439864889 GameObject: m_ObjectHideFlags: 0 @@ -3301,6 +4183,121 @@ RectTransform: m_AnchoredPosition: {x: -0.4870249, y: -43.242477} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4260758756044181754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6883970546238051001} + - component: {fileID: 2150789860981981562} + - component: {fileID: 3130921633580420078} + - component: {fileID: 8734647136834543879} + m_Layer: 0 + m_Name: SkeletonGraphic (huangjinpaotai_1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6883970546238051001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4260758756044181754} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1237, y: 1.1237, z: 1.1237} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 77188773409426491} + - {fileID: 1450043876634798425} + m_Father: {fileID: 3359937958531653490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 345.1, y: 0} + m_SizeDelta: {x: 250.26355, y: 81.49927} + m_Pivot: {x: 0.49989337, y: 0.00007573296} +--- !u!222 &2150789860981981562 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4260758756044181754} + m_CullTransparentMesh: 1 +--- !u!114 &3130921633580420078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4260758756044181754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: f4bf91503bc39ca44bb537ee943a99d0, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: out + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!114 &8734647136834543879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4260758756044181754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a0bd2a3126c052438fc0291e214e0a0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: 3 + turretLevel: 0 + setPosData: {fileID: 0} + btn_AddTurretNum: {fileID: 0} + btn_SubTractTurretNum: {fileID: 0} + bulletPrefab: {fileID: 1727303280587082, guid: cf19160f988c5a148b4f98c2ba1a8bef, + type: 3} + bulletPrefab_Two: {fileID: 1049455767047195, guid: df3c50e610b026549b73a6c4889a404e, + type: 3} --- !u!1 &4292851982342813353 GameObject: m_ObjectHideFlags: 0 @@ -3435,89 +4432,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4296420444062565728 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2623609561791338662} - - component: {fileID: 3720816618958656593} - - component: {fileID: 3178024414535782480} - m_Layer: 0 - m_Name: SkeletonGraphic (lanptpaotai_2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2623609561791338662 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4296420444062565728} - 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: 5125527587481968706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.5395966, y: -102.351364} - m_SizeDelta: {x: 86.49503, y: 89.74921} - m_Pivot: {x: 0.4822003, y: -0.07243594} ---- !u!222 &3720816618958656593 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4296420444062565728} - m_CullTransparentMesh: 1 ---- !u!114 &3178024414535782480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4296420444062565728} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} - 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: [] - skeletonDataAsset: {fileID: 11400000, guid: caa5cf5c58195524fafd0a8639407fac, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: out - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &4311354340067889378 GameObject: m_ObjectHideFlags: 0 @@ -3640,13 +4554,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -3671,7 +4593,7 @@ MonoBehaviour: type: 3} bulletPrefab_Two: {fileID: 1235537286137785, guid: b87e03e51ab83e744bf4b734e3b501cd, type: 3} ---- !u!1 &4501756557328072531 +--- !u!1 &4504618972599943743 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3679,56 +4601,92 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4281837917699283697} - - component: {fileID: 1392422723077176712} - - component: {fileID: 45943353116573643} + - component: {fileID: 4732517949855444066} m_Layer: 0 - m_Name: SkeletonGraphic (lvptfeiji) + m_Name: Bullit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4281837917699283697 +--- !u!224 &4732517949855444066 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4501756557328072531} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_GameObject: {fileID: 4504618972599943743} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0078002, y: 1.0078005, z: 1.0078005} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6052845187229679382} + 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.46991882, y: 49.97795} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4506633673912867954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 850872249310743269} + - component: {fileID: 1242549180868769276} + - component: {fileID: 8191725609116452728} + - component: {fileID: 6257860833696362807} + m_Layer: 5 + m_Name: Image (3) + m_TagString: ChangeTurret + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &850872249310743269 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4506633673912867954} + 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: 7451594843209618765} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_Father: {fileID: 6739341556210570986} + 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: 12.8} - m_SizeDelta: {x: 120.50528, y: 97.7559} - m_Pivot: {x: 0.49709913, y: 0.5050803} ---- !u!222 &1392422723077176712 + m_AnchoredPosition: {x: -146, y: 50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1242549180868769276 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4501756557328072531} + m_GameObject: {fileID: 4506633673912867954} m_CullTransparentMesh: 1 ---- !u!114 &45943353116573643 +--- !u!114 &8191725609116452728 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4501756557328072531} + m_GameObject: {fileID: 4506633673912867954} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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} @@ -3736,24 +4694,84 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 02e2a34ed05ccc2488bfe83f083af788, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: trans - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 + m_Sprite: {fileID: 21300000, guid: fe18ffad52388e24c802afac7be5390d, 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 &6257860833696362807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4506633673912867954} + 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: 8191725609116452728} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2190378019845123665} + m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp + m_MethodName: ChangeTurret + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6962888877589149824} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &4515224290348184758 GameObject: m_ObjectHideFlags: 0 @@ -3827,13 +4845,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -4039,7 +5065,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4692974259151236534} m_CullTransparentMesh: 1 ---- !u!1 &4862258275374553485 +--- !u!1 &4936214933898230993 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4047,81 +5073,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7699774046271177132} - - component: {fileID: 4331866330095549510} - - component: {fileID: 7567470143769586669} + - component: {fileID: 77188773409426491} + - component: {fileID: 639205809646801522} m_Layer: 0 - m_Name: SkeletonGraphic (vippaotai01_2) + m_Name: SkeletonGraphic (huangjinpaotai_2) (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7699774046271177132 +--- !u!224 &77188773409426491 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4862258275374553485} + m_GameObject: {fileID: 4936214933898230993} 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: 628983271918820405} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1034521838101397786} + - {fileID: 2324713258801040471} + m_Father: {fileID: 6883970546238051001} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.9199829, y: -122.64999} - m_SizeDelta: {x: 90.5, y: 96.25001} - m_Pivot: {x: 0.4916022, y: -0.13818176} ---- !u!222 &4331866330095549510 + m_AnchoredPosition: {x: -0.026721954, y: -0.9000015} + m_SizeDelta: {x: 96.048904, y: 108.64001} + m_Pivot: {x: 0.50485283, y: -0.08035717} +--- !u!222 &639205809646801522 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4862258275374553485} + m_GameObject: {fileID: 4936214933898230993} m_CullTransparentMesh: 1 ---- !u!114 &7567470143769586669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4862258275374553485} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} - 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: [] - skeletonDataAsset: {fileID: 11400000, guid: a52e36743270f3046b60449e3564d332, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: out - startingLoop: 0 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &4942636784516273018 GameObject: m_ObjectHideFlags: 0 @@ -4195,13 +5184,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -4400,6 +5397,121 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &5021674289292266505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5738415672704955863} + - component: {fileID: 6952451779527872524} + - component: {fileID: 1451703830815277551} + - component: {fileID: 5925899117660190050} + m_Layer: 0 + m_Name: SkeletonGraphic_Blue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5738415672704955863 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5021674289292266505} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1150001, y: 1.1150001, z: 1.1150001} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1277747926479178504} + - {fileID: 6573481029440643672} + m_Father: {fileID: 3359937958531653490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 345.1, y: 0} + m_SizeDelta: {x: 252.94702, y: 72.37079} + m_Pivot: {x: 0.50105476, y: 0.046561155} +--- !u!222 &6952451779527872524 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5021674289292266505} + m_CullTransparentMesh: 1 +--- !u!114 &1451703830815277551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5021674289292266505} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: d6b2ec7d196ac7d43bc2d065517c8443, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: out + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!114 &5925899117660190050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5021674289292266505} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a0bd2a3126c052438fc0291e214e0a0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: 2 + turretLevel: 0 + setPosData: {fileID: 0} + btn_AddTurretNum: {fileID: 0} + btn_SubTractTurretNum: {fileID: 0} + bulletPrefab: {fileID: 1207119993371665, guid: 154a9136554cd844fbf3ea8599ffd24a, + type: 3} + bulletPrefab_Two: {fileID: 1235537286137785, guid: b87e03e51ab83e744bf4b734e3b501cd, + type: 3} --- !u!1 &5038369111411525029 GameObject: m_ObjectHideFlags: 0 @@ -4770,6 +5882,150 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5277327605466573735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3631350795641191869} + - component: {fileID: 4233037645156138540} + - component: {fileID: 1418394400435886700} + - component: {fileID: 8735423286595921511} + m_Layer: 5 + m_Name: Image (4) + m_TagString: ChangeTurret + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3631350795641191869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5277327605466573735} + 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: 6739341556210570986} + 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: 155, y: 50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4233037645156138540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5277327605466573735} + m_CullTransparentMesh: 1 +--- !u!114 &1418394400435886700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5277327605466573735} + 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: 2dae17c3f3238644694b12e66eb98eb6, type: 2} + 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 &8735423286595921511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5277327605466573735} + 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: 1418394400435886700} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2190378019845123665} + m_TargetAssemblyTypeName: SitPosData, Assembly-CSharp + m_MethodName: ChangeTurret + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 2 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6962888877589149824} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &5336295820338659851 GameObject: m_ObjectHideFlags: 0 @@ -4805,89 +6061,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5420322744067117787 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5658339121134140708} - - component: {fileID: 1731303221607910218} - - component: {fileID: 1098040041815364871} - m_Layer: 0 - m_Name: SkeletonGraphic (huangjinfeiji) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5658339121134140708 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5420322744067117787} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6769106, y: 0.6769106, z: 0.6769106} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 9033931018099822141} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.026721954, y: 10.6} - m_SizeDelta: {x: 138.0057, y: 95.989456} - m_Pivot: {x: 0.5022374, y: 0.45956317} ---- !u!222 &1731303221607910218 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5420322744067117787} - m_CullTransparentMesh: 1 ---- !u!114 &1098040041815364871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5420322744067117787} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} - 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: [] - skeletonDataAsset: {fileID: 11400000, guid: 1169a3cf64d970040a71b425b93988b3, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: trans - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &5518718998949715589 GameObject: m_ObjectHideFlags: 0 @@ -5014,51 +6187,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 ---- !u!1 &5716869805638205858 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5125527587481968706} - - component: {fileID: 4489964319268957560} - m_Layer: 0 - m_Name: SkeletonGraphic (lanptpaotai_2) (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5125527587481968706 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5716869805638205858} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.706514, y: 0.706514, z: 0.706514} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2623609561791338662} - m_Father: {fileID: 3384422852841419605} - 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.26676726, y: 3.1993175} - m_SizeDelta: {x: 86.49503, y: 89.74921} - m_Pivot: {x: 0.4822003, y: -0.07243594} ---- !u!222 &4489964319268957560 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5716869805638205858} - m_CullTransparentMesh: 1 --- !u!1 &5719532938839920191 GameObject: m_ObjectHideFlags: 0 @@ -5209,89 +6337,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5776249914018302171 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6762869871359625580} - - component: {fileID: 199022717463061832} - - component: {fileID: 7034589668338387262} - m_Layer: 0 - m_Name: SkeletonGraphic (huangjinpaotai_2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6762869871359625580 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5776249914018302171} - 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: 1 - m_Children: [] - m_Father: {fileID: 1642361589275851851} - 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.46611023, y: -121.91077} - m_SizeDelta: {x: 96.048904, y: 108.64001} - m_Pivot: {x: 0.50485283, y: -0.08035717} ---- !u!222 &199022717463061832 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5776249914018302171} - m_CullTransparentMesh: 1 ---- !u!114 &7034589668338387262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5776249914018302171} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} - 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: [] - skeletonDataAsset: {fileID: 11400000, guid: 60f94d1b1ab88874cb1d9875d2f5d921, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: out - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &5829955823270693100 GameObject: m_ObjectHideFlags: 0 @@ -5428,7 +6473,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8019622945320605939 RectTransform: m_ObjectHideFlags: 0 @@ -5449,6 +6494,7 @@ RectTransform: - {fileID: 1233422057346441001} - {fileID: 7085073037580773451} - {fileID: 2915075105150539955} + - {fileID: 1600270965213060995} m_Father: {fileID: 245637205031072731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5548,7 +6594,7 @@ MonoBehaviour: totalConsumeDiamond: 0 reliefGoldCount: 0 token: - posID: 1 + posID: 0 tMP_TurretConsumeNum: {fileID: 9184328036284424899} tMP_GoldNum: {fileID: 415724694880221988} goldNum: 0 @@ -5561,6 +6607,9 @@ MonoBehaviour: currentTurretIndex: 0 currentTurretID: 0 currentTurret: {fileID: 0} + monCotl_Lock: {fileID: 0} + isLock: 0 + lockFX: {fileID: 5044773197927740105} skeletonAnimation: {fileID: 0} tra_CurrTurret: {fileID: 0} tra_CurrFly: {fileID: 0} @@ -5600,6 +6649,126 @@ RectTransform: m_AnchoredPosition: {x: -2.0093994, y: -24.55217} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5900740813468116083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5388625252552662740} + - component: {fileID: 4220624067690809639} + - component: {fileID: 5052808200127559456} + - component: {fileID: 5849059604467717707} + m_Layer: 5 + m_Name: Down + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5388625252552662740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5900740813468116083} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3180808, y: 1.3180808, z: 1.3180808} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 9096498857142868871} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 48.61647, y: 46.43793} + m_SizeDelta: {x: 34, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4220624067690809639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5900740813468116083} + m_CullTransparentMesh: 1 +--- !u!114 &5052808200127559456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5900740813468116083} + 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: c20a60fd46cacd84b9ac701379d42798, 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 &5849059604467717707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5900740813468116083} + 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: 5052808200127559456} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &6110699967402531193 GameObject: m_ObjectHideFlags: 0 @@ -5807,13 +6976,21 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -5890,17 +7067,25 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 ---- !u!1 &6542071130363818977 +--- !u!1 &6293960372765286190 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5908,52 +7093,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7451594843209618765} - - component: {fileID: 2142603924714051015} - - component: {fileID: 5667053098227351648} + - component: {fileID: 6057432198244768730} + - component: {fileID: 698778576728053598} + - component: {fileID: 2076854086092162498} m_Layer: 0 - m_Name: SkeletonGraphic_Green + m_Name: SkeletonGraphic (lvptpaotai_2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7451594843209618765 + m_IsActive: 1 +--- !u!224 &6057432198244768730 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6542071130363818977} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6293960372765286190} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.4314967, y: 1.1809849, z: 1.4314967} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 252303370026750404} - - {fileID: 4281837917699283697} - m_Father: {fileID: 9154730181581589643} + m_Children: [] + m_Father: {fileID: 6052845187229679382} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 355.7, y: 0} - m_SizeDelta: {x: 252.0647, y: 68.40918} - m_Pivot: {x: 0.49851003, y: 0.02986886} ---- !u!222 &2142603924714051015 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -29.8} + m_SizeDelta: {x: 96.186035, y: 91.746864} + m_Pivot: {x: 0.49956542, y: -0.053092174} +--- !u!222 &698778576728053598 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6542071130363818977} + m_GameObject: {fileID: 6293960372765286190} m_CullTransparentMesh: 1 ---- !u!114 &5667053098227351648 +--- !u!114 &2076854086092162498 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6542071130363818977} + m_GameObject: {fileID: 6293960372765286190} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} @@ -5967,25 +7150,33 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 1249e68533112884ba755b84f28d4086, type: 2} - initialSkinName: default + skeletonDataAsset: {fileID: 11400000, guid: 782f605c06be63b46807dd6d8f189de4, type: 2} + initialSkinName: initialFlipX: 0 initialFlipY: 0 startingAnimation: out - startingLoop: 1 + startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 ---- !u!1 &6850585065230825853 +--- !u!1 &6356273702521874365 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5993,50 +7184,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6678118897333048340} - - component: {fileID: 997232959259641025} - - component: {fileID: 8173970268494004267} + - component: {fileID: 6573481029440643672} + - component: {fileID: 5323315399751120232} + - component: {fileID: 8301940715860005316} m_Layer: 0 m_Name: SkeletonGraphic (lanptfeiji) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6678118897333048340 + m_IsActive: 0 +--- !u!224 &6573481029440643672 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6850585065230825853} + m_GameObject: {fileID: 6356273702521874365} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.706514, y: 0.706514, z: 0.706514} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 3384422852841419605} + m_Father: {fileID: 5738415672704955863} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.2667737, y: 9.232963} m_SizeDelta: {x: 118.99476, y: 95.25393} m_Pivot: {x: 0.5019371, y: 0.49556285} ---- !u!222 &997232959259641025 +--- !u!222 &5323315399751120232 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6850585065230825853} + m_GameObject: {fileID: 6356273702521874365} m_CullTransparentMesh: 1 ---- !u!114 &8173970268494004267 +--- !u!114 &8301940715860005316 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6850585065230825853} + m_GameObject: {fileID: 6356273702521874365} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} @@ -6055,19 +7246,141 @@ MonoBehaviour: initialFlipX: 0 initialFlipY: 0 startingAnimation: trans - startingLoop: 1 + startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 +--- !u!1 &6601915184534504369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4233550562738674888} + m_Layer: 0 + m_Name: Bullit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4233550562738674888 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6601915184534504369} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0078005, y: 1.0078005, z: 1.0078005} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1277747926479178504} + 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: -2.0093994, y: -24.55217} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6962888877589149824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6739341556210570986} + - component: {fileID: 4362149249383376008} + - component: {fileID: 1750990805955728377} + m_Layer: 5 + m_Name: Image (1) + m_TagString: ChangeTurret + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6739341556210570986 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962888877589149824} + 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: 5156679207977476091} + - {fileID: 850872249310743269} + - {fileID: 3631350795641191869} + - {fileID: 1144585611597707145} + m_Father: {fileID: 3359937958531653490} + 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: -56.52542, y: 23.623} + m_SizeDelta: {x: 426.7102, y: 240.62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4362149249383376008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962888877589149824} + m_CullTransparentMesh: 1 +--- !u!114 &1750990805955728377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962888877589149824} + 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: 0.5471698, g: 0.5471698, b: 0.5471698, a: 0.49019608} + 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!1 &7036475454652917956 GameObject: m_ObjectHideFlags: 0 @@ -6144,6 +7457,76 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7138567580095670559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3856749598235783551} + - component: {fileID: 3984077898608651866} + - component: {fileID: 1907314563882114244} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3856749598235783551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7138567580095670559} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8533108, y: 0.8533108, z: 0.8533108} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6660648050129894953} + - {fileID: 2205130348057220225} + - {fileID: 2820258039669297249} + - {fileID: 8223402693406750132} + m_Father: {fileID: 3359937958531653490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 344.1999, y: 55.49996} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3984077898608651866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7138567580095670559} + m_CullTransparentMesh: 1 +--- !u!95 &1907314563882114244 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7138567580095670559} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 22b58d64e6ea9a74f92f6b7a0e5ef70b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7267128499720354191 GameObject: m_ObjectHideFlags: 0 @@ -6339,7 +7722,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &7369797664749479923 +--- !u!1 &7338850536553507672 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6347,58 +7730,56 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9179323081622669638} - - component: {fileID: 3891131868498632733} - - component: {fileID: 2242062552531366239} - m_Layer: 0 - m_Name: SkeletonGraphic_VIP + - component: {fileID: 340013344488207026} + - component: {fileID: 8848018123607634864} + - component: {fileID: 8977871219812629068} + m_Layer: 5 + m_Name: Consume m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9179323081622669638 + m_IsActive: 1 +--- !u!224 &340013344488207026 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7369797664749479923} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 7338850536553507672} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 628983271918820405} - - {fileID: 2401569024815881289} - m_Father: {fileID: 9154730181581589643} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1136845146730457847} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 354, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 11.9341} + m_SizeDelta: {x: 200, y: 23.8682} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3891131868498632733 +--- !u!222 &8848018123607634864 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7369797664749479923} + m_GameObject: {fileID: 7338850536553507672} m_CullTransparentMesh: 1 ---- !u!114 &2242062552531366239 +--- !u!114 &8977871219812629068 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7369797664749479923} + m_GameObject: {fileID: 7338850536553507672} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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} @@ -6406,24 +7787,75 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 70f9119ea94db6341a7851e42aa06321, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: out - startingLoop: 0 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 + m_text: 100000 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: e0ff1fe67c94ef043ae82456319d6068, 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: -7.3 + 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 &7410577133022972788 GameObject: m_ObjectHideFlags: 0 @@ -6559,91 +7991,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7551417413763025524 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9033931018099822141} - - component: {fileID: 2543654715082430091} - - component: {fileID: 84172330477073591} - m_Layer: 0 - m_Name: SkeletonGraphic (huangjinpaotai_1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9033931018099822141 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7551417413763025524} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.4773, y: 1.4773, z: 1.4773} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1642361589275851851} - - {fileID: 5658339121134140708} - m_Father: {fileID: 9154730181581589643} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 360.7, y: 0} - m_SizeDelta: {x: 250.26355, y: 81.49927} - m_Pivot: {x: 0.49989337, y: 0.00007573296} ---- !u!222 &2543654715082430091 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7551417413763025524} - m_CullTransparentMesh: 1 ---- !u!114 &84172330477073591 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7551417413763025524} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} - 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: [] - skeletonDataAsset: {fileID: 11400000, guid: f4bf91503bc39ca44bb537ee943a99d0, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: out - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 --- !u!1 &7552227473400021725 GameObject: m_ObjectHideFlags: 0 @@ -6670,11 +8017,11 @@ Transform: m_GameObject: {fileID: 7552227473400021725} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -815.12274, y: -373.67035, z: 0} + m_LocalPosition: {x: -409.18878, y: -91.88049, z: 0} m_LocalScale: {x: 2.4365902, y: 2.4365902, z: 2.4365902} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 245637205031072731} + m_Father: {fileID: 8019622945320605939} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5044773197927740105 SpriteRenderer: @@ -6728,6 +8075,306 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7569932480623536025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2586931238896229995} + - component: {fileID: 8585025397567483727} + - component: {fileID: 1136350287412920581} + m_Layer: 5 + m_Name: GlodNum + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2586931238896229995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569932480623536025} + 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: 1136845146730457847} + 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: -15.9745} + m_SizeDelta: {x: 200, y: 35.259} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8585025397567483727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569932480623536025} + m_CullTransparentMesh: 1 +--- !u!114 &1136350287412920581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569932480623536025} + 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: 1000001234 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6a4ac15267282aa4790bdbb1dbbd6a3a, 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: -9.44 + 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 &7661024984517628361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 905171006867444295} + - component: {fileID: 4903389970647341283} + - component: {fileID: 133411009337950669} + m_Layer: 0 + m_Name: SkeletonGraphic (vippaotai01_2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &905171006867444295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661024984517628361} + 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: 2002625151011023770} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.9199829, y: -122.64999} + m_SizeDelta: {x: 90.5, y: 96.25001} + m_Pivot: {x: 0.4916022, y: -0.13818176} +--- !u!222 &4903389970647341283 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661024984517628361} + m_CullTransparentMesh: 1 +--- !u!114 &133411009337950669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661024984517628361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: a52e36743270f3046b60449e3564d332, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: out + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!1 &7673547978877957968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6660648050129894953} + - component: {fileID: 3225417488207432610} + - component: {fileID: 8297669711567754328} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6660648050129894953 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673547978877957968} + 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: 3856749598235783551} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 127.99997, y: 128.00003} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3225417488207432610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673547978877957968} + m_CullTransparentMesh: 1 +--- !u!114 &8297669711567754328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673547978877957968} + 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: d1802871c6e988242a9d6d70ab47ebe8, 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 &7745462318437291858 GameObject: m_ObjectHideFlags: 0 @@ -6935,13 +8582,188 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!1 &7974155150910054527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2820258039669297249} + - component: {fileID: 322904659234812795} + - component: {fileID: 2132358097454288175} + m_Layer: 5 + m_Name: sanjiao + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2820258039669297249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7974155150910054527} + 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: 2039827835170161544} + m_Father: {fileID: 3856749598235783551} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 127.99997, y: 128.00003} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &322904659234812795 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7974155150910054527} + m_CullTransparentMesh: 1 +--- !u!114 &2132358097454288175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7974155150910054527} + 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: d1802871c6e988242a9d6d70ab47ebe8, 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 &8056115733894510833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1450043876634798425} + - component: {fileID: 1752737745915292282} + - component: {fileID: 7024984482092808637} + m_Layer: 0 + m_Name: SkeletonGraphic (huangjinfeiji) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1450043876634798425 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8056115733894510833} + 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: 6883970546238051001} + 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.026721954, y: 10.6} + m_SizeDelta: {x: 138.0057, y: 95.989456} + m_Pivot: {x: 0.5022374, y: 0.45956317} +--- !u!222 &1752737745915292282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8056115733894510833} + m_CullTransparentMesh: 1 +--- !u!114 &7024984482092808637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8056115733894510833} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 1169a3cf64d970040a71b425b93988b3, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: trans + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -7087,6 +8909,52 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &8435974626639782798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1277747926479178504} + - component: {fileID: 5181961682705634065} + m_Layer: 0 + m_Name: SkeletonGraphic (lanptpaotai_2) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1277747926479178504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8435974626639782798} + 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: 1 + m_Children: + - {fileID: 5104424221228601176} + - {fileID: 4233550562738674888} + m_Father: {fileID: 5738415672704955863} + 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.26676726, y: 18.7} + m_SizeDelta: {x: 86.49503, y: 89.74921} + m_Pivot: {x: 0.4822003, y: -0.07243594} +--- !u!222 &5181961682705634065 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8435974626639782798} + m_CullTransparentMesh: 1 --- !u!1 &8451454695118831851 GameObject: m_ObjectHideFlags: 0 @@ -7338,6 +9206,198 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8687484885566208769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9096498857142868871} + - component: {fileID: 2232960662282487433} + - component: {fileID: 6116352611233803315} + - component: {fileID: 4547482054913003313} + m_Layer: 0 + m_Name: SkeletonGraphic_Green + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9096498857142868871 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687484885566208769} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.115, y: 1.1150001, z: 1.1150001} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 6052845187229679382} + - {fileID: 7581076340424207803} + - {fileID: 3671509148056177157} + - {fileID: 5388625252552662740} + m_Father: {fileID: 3359937958531653490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 345.1, y: 0} + m_SizeDelta: {x: 252.0647, y: 68.40918} + m_Pivot: {x: 0.49851003, y: 0.02986886} +--- !u!222 &2232960662282487433 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687484885566208769} + m_CullTransparentMesh: 1 +--- !u!114 &6116352611233803315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687484885566208769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 1249e68533112884ba755b84f28d4086, type: 2} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!114 &4547482054913003313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687484885566208769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a0bd2a3126c052438fc0291e214e0a0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: 1 + turretLevel: 0 + setPosData: {fileID: 0} + btn_AddTurretNum: {fileID: 553376401882686484} + btn_SubTractTurretNum: {fileID: 5849059604467717707} + bulletPrefab: {fileID: 1166920474713197, guid: 279ce3d544e4bc34097fc18fccb2ceac, + type: 3} + bulletPrefab_Two: {fileID: 1177632837766673, guid: ca64d0abc6450584c839b6b8ca03910a, + type: 3} +--- !u!1 &8728621748360804140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 607557626165084407} + - component: {fileID: 4879277854694494230} + - component: {fileID: 160036917860325874} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &607557626165084407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728621748360804140} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2652, y: 1.2652, z: 1.2652} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2205130348057220225} + 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: 3.3} + m_SizeDelta: {x: 50, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4879277854694494230 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728621748360804140} + m_CullTransparentMesh: 1 +--- !u!114 &160036917860325874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728621748360804140} + 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: d968a389b014954429e08dc57a536192, 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 &8810553189525763901 GameObject: m_ObjectHideFlags: 0 @@ -7413,6 +9473,126 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8884254499289628367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3671509148056177157} + - component: {fileID: 4406402324317182588} + - component: {fileID: 8263771666245451966} + - component: {fileID: 553376401882686484} + m_Layer: 5 + m_Name: Up + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3671509148056177157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884254499289628367} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3567858, y: 1.3567858, z: 1.3567858} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 9096498857142868871} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 200.81374, y: 45.810112} + m_SizeDelta: {x: 34, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4406402324317182588 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884254499289628367} + m_CullTransparentMesh: 1 +--- !u!114 &8263771666245451966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884254499289628367} + 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: 2935bd2bb6b2b564fa37639a534c9039, 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 &553376401882686484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884254499289628367} + 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: 8263771666245451966} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8924013633821911978 GameObject: m_ObjectHideFlags: 0 @@ -7486,13 +9666,112 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + updateWhenInvisible: 3 unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 meshGenerator: settings: useClipping: 1 zSpacing: 0 pmaVertexColors: 1 tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 +--- !u!1 &8940335284457036245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7581076340424207803} + - component: {fileID: 106710942227255682} + - component: {fileID: 2254954991720723577} + m_Layer: 0 + m_Name: SkeletonGraphic (lvptfeiji) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7581076340424207803 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8940335284457036245} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9096498857142868871} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 12.8} + m_SizeDelta: {x: 120.50528, y: 97.7559} + m_Pivot: {x: 0.49709913, y: 0.5050803} +--- !u!222 &106710942227255682 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8940335284457036245} + m_CullTransparentMesh: 1 +--- !u!114 &2254954991720723577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8940335284457036245} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 02e2a34ed05ccc2488bfe83f083af788, type: 2} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: trans + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + unscaledTime: 0 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 calculateTangents: 0 addNormals: 0 immutableTriangles: 0 @@ -7571,7 +9850,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9084811329050793906 +--- !u!1 &9086780677260762203 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7579,58 +9858,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3384422852841419605} - - component: {fileID: 6520625300795100947} - - component: {fileID: 6783035137443493646} - m_Layer: 0 - m_Name: SkeletonGraphic_Blue + - component: {fileID: 2205130348057220225} + - component: {fileID: 7783384805972302561} + - component: {fileID: 7016913579621385032} + m_Layer: 5 + m_Name: Image (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3384422852841419605 + m_IsActive: 1 +--- !u!224 &2205130348057220225 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9084811329050793906} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 9086780677260762203} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.4154, y: 1.4154, z: 1.4154} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 5125527587481968706} - - {fileID: 6678118897333048340} - m_Father: {fileID: 9154730181581589643} + - {fileID: 607557626165084407} + m_Father: {fileID: 3856749598235783551} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 360.7, y: 0} - m_SizeDelta: {x: 252.94702, y: 72.37079} - m_Pivot: {x: 0.50105476, y: 0.046561155} ---- !u!222 &6520625300795100947 + m_AnchoredPosition: {x: 128, y: 261.64062} + m_SizeDelta: {x: 50, y: 51.1976} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7783384805972302561 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9084811329050793906} + m_GameObject: {fileID: 9086780677260762203} m_CullTransparentMesh: 1 ---- !u!114 &6783035137443493646 +--- !u!114 &7016913579621385032 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9084811329050793906} - m_Enabled: 1 + m_GameObject: {fileID: 9086780677260762203} + m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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} @@ -7638,24 +9916,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: d6b2ec7d196ac7d43bc2d065517c8443, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: out - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 + m_Sprite: {fileID: 21300000, guid: 764b0f67aca43e04e9ffe141aeaa8440, 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 &9108746378142470172 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs index 221e07ba7..8479ae9e6 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs @@ -2,7 +2,7 @@ using Assets.MyGame.Scripts.Net.API; using Assets.MyGame.Scripts.Net.WebResponses; using Newtonsoft.Json; -using Spine.Unity; +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -26,18 +26,34 @@ public class GameMainPanel_XJMH : GameMainPanel_Base public Toggle toggle_Three; bool isLock = false; bool isThree = false; - MonsterContral monCotl_Lock; + //MonsterContral monCotl_Lock; public GameObject LockFX; public List list_Sits = new List(); public SitPosData currSitData; int bulletCount = 0; - public void JoinGame(int sitNum, int goldNum, int consumeGlod, string currentTurretID, UserToken user = null) + public override void Awake() + { + base.Awake(); + EventCenter.Instance.AddEventListener(ConstEventString.SyncGameData_Rotate, SyncGameData_Rotate); + EventCenter.Instance.AddEventListener(ConstEventString.SyncGameData_FireBullet, SyncGameData_FireBullit); + EventCenter.Instance.AddEventListener(ConstEventString.SyncGameData_ChangeTargetMonster, SyncGameData_ChangeTargetMonster); + + } + private void OnDestroy() + { + EventCenter.Instance.RemoveEventListener(ConstEventString.SyncGameData_Rotate, SyncGameData_Rotate); + EventCenter.Instance.RemoveEventListener(ConstEventString.SyncGameData_FireBullet, SyncGameData_FireBullit); + EventCenter.Instance.RemoveEventListener(ConstEventString.SyncGameData_ChangeTargetMonster, SyncGameData_ChangeTargetMonster); + + } + public void JoinGame(int sitNum, long goldNum, long consumeGlod, int currentTurretID, UserToken user = null) { foreach (var item in list_Sits) { + if (item.posID == sitNum) { item.gameObject.SetActive(true); @@ -49,7 +65,8 @@ public class GameMainPanel_XJMH : GameMainPanel_Base item.goldNum = goldNum; item.consumeGoldNum = consumeGlod; item.tMP_GoldNum.text = goldNum.ToString(); - item.currentTurretID = currentTurretID; + + item.ChangeTurret(currentTurretID); item.tMP_TurretConsumeNum.text = consumeGlod.ToString(); } } @@ -65,7 +82,6 @@ public class GameMainPanel_XJMH : GameMainPanel_Base if (isOpenSetting) { StartCoroutine(CloseSettingList()); - } else { @@ -234,11 +250,14 @@ public class GameMainPanel_XJMH : GameMainPanel_Base } #endregion + foreach (var item in list_Sits) + { + } if (isLock) { - if (monCotl_Lock == null) + if (currSitData.monCotl_Lock == null) { CancelLock(); } @@ -248,17 +267,47 @@ public class GameMainPanel_XJMH : GameMainPanel_Base { Vector2 worldPos = Camera.main.ScreenToWorldPoint(Touchscreen.current.primaryTouch.position.ReadValue()); RaycastHit2D hit = Physics2D.Raycast(worldPos, Vector2.zero, 50, LayerMask.GetMask("Fish")); - monCotl_Lock = hit.transform?.GetComponentInParent(); + currSitData.monCotl_Lock = hit.transform?.GetComponentInParent(); - if (monCotl_Lock != null && monCotl_Lock.gameObject.activeSelf) //这里为之后加对象池铺垫 + if (currSitData.monCotl_Lock != null && currSitData.monCotl_Lock.gameObject.activeSelf) //这里为之后加对象池铺垫 { foreach (BullitMove item in bulletParent.GetComponentsInChildren()) { - item.Lock(monCotl_Lock); + item.Lock(currSitData.monCotl_Lock); + + + } + { + SyncGameData sgd = new SyncGameData + { + sitPos = currSitData.posID, + frameType = FrameDataType.changeAutoTarget, + frameData = new FrameData_ChangeAutoTarget + { + targetGuid = currSitData.monCotl_Lock.guid, + } + }; + + WebSocketSendList.SyncGameData(sgd); + } + if (!LockFX.activeSelf) { LockFX.SetActive(true); + { + SyncGameData sgd = new SyncGameData + { + sitPos = currSitData.posID, + frameType = FrameDataType.changeAutoTarget, + frameData = new FrameData_ChangeAutoTarget + { + targetGuid = currSitData.monCotl_Lock.guid, + } + }; + + WebSocketSendList.SyncGameData(sgd); + } } } else @@ -266,13 +315,13 @@ public class GameMainPanel_XJMH : GameMainPanel_Base CancelLock(); } } - - if (monCotl_Lock != null) + if (currSitData.monCotl_Lock != null) { - PaoTaRotate(); - LockFX.transform.position = monCotl_Lock.transform.position; + SelfPaoTaRotate(); + LockFX.transform.position = currSitData.monCotl_Lock.transform.position; //FireBullit(); } + } else { @@ -282,7 +331,7 @@ public class GameMainPanel_XJMH : GameMainPanel_Base //FireBullit(); if (!isZD) { - PaoTaRotate(); + SelfPaoTaRotate(); } } @@ -295,7 +344,7 @@ public class GameMainPanel_XJMH : GameMainPanel_Base if (isZD&&isLock==false) { - PaoTaRotate(); + SelfPaoTaRotate(); } } @@ -306,15 +355,15 @@ public class GameMainPanel_XJMH : GameMainPanel_Base bulletCount = 0; } - private void PaoTaRotate() + private void SelfPaoTaRotate() { - - #region 计算点击方向 - Vector2 touchPos; + + #region 计算点击方向 + Vector2 touchPos; // 获取触摸位置（屏幕坐标） - if (monCotl_Lock != null) + if (currSitData.monCotl_Lock != null) { - touchPos = Camera.main.WorldToScreenPoint(monCotl_Lock.transform.position); + touchPos = Camera.main.WorldToScreenPoint(currSitData.monCotl_Lock.transform.position); } else { @@ -324,37 +373,193 @@ public class GameMainPanel_XJMH : GameMainPanel_Base // 转换Canvas坐标 Vector2 worldPos; RectTransformUtility.ScreenPointToLocalPointInRectangle(currSitData.tra_CurrTurret.transform.parent as RectTransform, touchPos, null, out worldPos); - // 计算方向 Vector2 dir = worldPos - currSitData.tra_CurrTurret.GetComponent().anchoredPosition; // 计算角度 float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg - 90f; - currSitData.tra_CurrTurret.transform.rotation = Quaternion.Euler(Vector3.forward * angle); + + + + SetSitTurretRotame(currSitData,angle); + + } + public void SyncGameData_Rotate(SyncGameData syncGameData) + { + if (syncGameData.sitPos!=currSitData.posID) + { + var rotateData = JsonConvert.DeserializeObject(syncGameData.frameData.ToString()); + SetSitTurretRotame(list_Sits[syncGameData.sitPos], rotateData.angle, false); + } + } + float frameTime=0; + //IEnumerator RotateIE(SitPosData sitPosData, Quaternion qua) + //{ + + // while (true) + // { + // yield return null; + + // sitPosData.tra_CurrTurret.transform.rotation =Quaternion.Lerp(sitPosData.tra_CurrTurret.transform.rotation,qua,0.6f); + // } + + //} + IEnumerator RotateIE_Angle(SitPosData sitPosData, Quaternion qua) + { + // 设置一个较小的阈值，判断是否旋转到位 + float angleThreshold = 0.1f; // 当角度差小于0.1度时停止 + + while (true) + { + // 计算当前旋转和目标旋转之间的角度差 + float angleDifference = Quaternion.Angle(sitPosData.tra_CurrTurret.transform.rotation, qua); + + // 如果角度差很小，认为旋转完成 + if (angleDifference <= angleThreshold) + { + // 强制设置最终旋转，避免微小误差 + sitPosData.tra_CurrTurret.transform.rotation = qua; + break; // 退出循环 + } + + // 执行旋转插值 + sitPosData.tra_CurrTurret.transform.rotation = Quaternion.Lerp( + sitPosData.tra_CurrTurret.transform.rotation, + qua, + 0.6f // 这个系数决定了旋转速度 + ); + + yield return null; // 等待下一帧 + } + + Debug.Log("旋转完成"); + } + IEnumerator RotateIE_Time(SitPosData sitPosData, Quaternion qua) + { + float rotateDuration = 0.3f; // 旋转持续时间 + float elapsedTime = 0f; + Quaternion startRotation = sitPosData.tra_CurrTurret.transform.rotation; + + while (elapsedTime < rotateDuration) + { + elapsedTime += Time.deltaTime; + float t = elapsedTime / rotateDuration; + + // 使用Slerp进行更平滑的球面插值 + sitPosData.tra_CurrTurret.transform.rotation = Quaternion.Slerp( + startRotation, + qua, + t + ); + + yield return null; + } + + // 确保最终旋转精确 + sitPosData.tra_CurrTurret.transform.rotation = qua; + } + private Coroutine currentRotateCoroutine; + private void SetSitTurretRotame(SitPosData sitPosData,float angle, bool isSelf = true) + { + + + if (isSelf==false) + { + Vector3 v3 = Vector3.forward * angle; + // 如果已有协程在运行，先停止它 + if (currentRotateCoroutine != null) + { + StopCoroutine(currentRotateCoroutine); + currentRotateCoroutine = null; + } + + // 启动新的协程并保存引用 + currentRotateCoroutine = StartCoroutine(RotateIE_Angle(sitPosData, Quaternion.Euler(v3))); + //StartCoroutine(RotateIE(sitPosData,)); + return ; + } + else + { + sitPosData.tra_CurrTurret.transform.rotation = Quaternion.Euler(Vector3.forward * angle); + frameTime += Time.deltaTime; + if (frameTime > 0.1f) + { + { + SyncGameData sgd = new SyncGameData + { + sitPos = currSitData.posID, + frameType = FrameDataType.rotateTurrect, + frameData = new FrameData_Rotate + { + angle = angle, + } + }; + + WebSocketSendList.SyncGameData(sgd); + } + } + } + #endregion clickTime += Time.deltaTime; if (clickTime > attackTime) { clickTime = 0; - + } else { return; } - FireBullit(angle); + + + FireBullit(currSitData,angle,isThree,isZD,isLock,isShuang); + { + SyncGameData sgd = new SyncGameData + { + sitPos = currSitData.posID, + frameType = FrameDataType.fireBullet, + frameData = new FrameData_FireBullit + { + angle = angle, + gold = currSitData.goldNum, + isSanShe = isThree, + twoRTruuect = isShuang, + isSuoDing = isLock, + auto = isZD + } + }; + + WebSocketSendList.SyncGameData(sgd); + } } - private void CancelLock() { monCotl_Lock = null; LockFX.SetActive(false); } - private void FireBullit(float angle) + private void CancelLock() { currSitData.monCotl_Lock = null; LockFX.SetActive(false); } + public void SyncGameData_FireBullit(SyncGameData syncGameData) + { + if (syncGameData.sitPos != currSitData.posID) + { + var fireBullet = JsonConvert.DeserializeObject(syncGameData.frameData.ToString()); + FireBullit(list_Sits[syncGameData.sitPos], fireBullet.angle, fireBullet.isSanShe, fireBullet.auto, fireBullet.isSuoDing, fireBullet.twoRTruuect, false); + } + } + public void SyncGameData_ChangeTargetMonster(SyncGameData syncGameData) + { + if (syncGameData.sitPos != currSitData.posID) + { + var fireBullet = JsonConvert.DeserializeObject(syncGameData.frameData.ToString()); + list_Sits[syncGameData.sitPos].monCotl_Lock = CreateFishManager.Instance.fishDatas_hashCodekey[fireBullet.targetGuid]; + list_Sits[syncGameData.sitPos].isLock = true; + } + } + private void FireBullit(SitPosData sitPosData,float angle, bool isSanShe, bool auto, bool isSuoDing,bool twoRTruuect, bool isSelf=true) { - //计算方向 Vector2 startV2; - startV2 = CoordinateTransformation.AnchoredPos_ToCanvas(currSitData.tra_CurrTurret.transform.GetChild(1).GetComponent(), UIManager.Instance.uiRoot.GetComponent()); + startV2 = CoordinateTransformation.AnchoredPos_ToCanvas(sitPosData.tra_CurrTurret.transform.GetChild(1).GetComponent(), UIManager.Instance.uiRoot.GetComponent()); startV2 = CoordinateTransformation.CanvasToWorld(startV2, UIManager.Instance.uiRoot.GetComponent(), Camera.main); //Vector2 endV2 = touchPos; @@ -363,24 +568,24 @@ public class GameMainPanel_XJMH : GameMainPanel_Base //obj_CurrTurret.GetComponent() - if (isThree) + if (isSanShe) { - BullitMove bulletMove1 = CreateBullet(angle - 20, startV2); - BullitMove bulletMove2 = CreateBullet(angle, startV2); - BullitMove bulletMove3 = CreateBullet(angle + 20, startV2); - if (isLock) + BullitMove bulletMove1 = CreateBullet(angle - 20, startV2, sitPosData, Guid.NewGuid().ToString(), twoRTruuect); + BullitMove bulletMove2 = CreateBullet(angle, startV2, sitPosData, Guid.NewGuid().ToString(), twoRTruuect); + BullitMove bulletMove3 = CreateBullet(angle + 20, startV2, sitPosData, Guid.NewGuid().ToString(), twoRTruuect); + if (isSuoDing) { - bulletMove1?.Lock(monCotl_Lock); - bulletMove2?.Lock(monCotl_Lock); - bulletMove3?.Lock(monCotl_Lock); + bulletMove1?.Lock(sitPosData.monCotl_Lock); + bulletMove2?.Lock(sitPosData.monCotl_Lock); + bulletMove3?.Lock(sitPosData.monCotl_Lock); } } else { - BullitMove bulletMove = CreateBullet(angle, startV2); - if (isLock) + BullitMove bulletMove = CreateBullet(angle, startV2, sitPosData, Guid.NewGuid().ToString(), twoRTruuect); + if (isSuoDing) { - bulletMove?.Lock(monCotl_Lock); + bulletMove?.Lock(sitPosData.monCotl_Lock); } } @@ -389,35 +594,37 @@ public class GameMainPanel_XJMH : GameMainPanel_Base public Toggle toggle_Shuang; bool isShuang= false; - private BullitMove CreateBullet(float angle, Vector2 startV2) + private BullitMove CreateBullet(float angle, Vector2 startV2, SitPosData roomJoinNotice,string guid,bool twoRTruuect) { GameObject bulletPrefab; //这里有双倍炮台的需求 - if (isShuang) + if (twoRTruuect) { - bulletPrefab = currSitData.currentTurret.bulletPrefab_Two; - if (!currSitData.ConsumeGold(2)) + bulletPrefab = roomJoinNotice.currentTurret.bulletPrefab_Two; + if (!roomJoinNotice.ConsumeGold(2)) { return null; } } else { - bulletPrefab = currSitData.currentTurret.bulletPrefab; - if (!currSitData.ConsumeGold()) + bulletPrefab = roomJoinNotice.currentTurret.bulletPrefab; + if (!roomJoinNotice.ConsumeGold()) { return null; } } var bulletMove = Instantiate(bulletPrefab, startV2, Quaternion.Euler(Vector3.forward * angle), bulletParent.transform).GetComponent(); - bulletMove.user = GameManager.Instance.gameData.roomJoinNotice; - bulletMove.playerID = GameManager.Instance.gameData.currUser; - currSitData.skeletonAnimation.AnimationState.SetAnimation(0, "shot", false); + bulletMove.user = roomJoinNotice.user; + bulletMove.playerID = roomJoinNotice.user.id; + bulletMove.bulletID= guid; + roomJoinNotice.skeletonAnimation.AnimationState.SetAnimation(0, "shot", false); bulletCount++; + return bulletMove; } - + bool isfirstShow=false; protected override void OnShow(object args = null) { base.OnShow(args); @@ -425,11 +632,30 @@ public class GameMainPanel_XJMH : GameMainPanel_Base var v = JsonConvert.DeserializeObject>(args.ToString()); if (v.arguments.Count > 0) { - GameManager.Instance.gameData.roomJoinNotice = v.arguments[0]; + RoomJoinNotice roomJoinNotice = v.arguments[0]; - JoinGame(roomJoinNotice.position, roomJoinNotice.gold, roomJoinNotice.cannonMultiple, roomJoinNotice.cannonId); - currSitData = list_Sits[roomJoinNotice.position - 1]; - currSitData.ChangeTurret(1); + if (isfirstShow == false) + { + + foreach (var item in GameManager.Instance.gameData.currRoomData.players) + { + JoinGame(item.position, item.gold, item.cannonMultiple, 1); + } + GameManager.Instance.gameData.roomJoinNotice = v.arguments[0]; + isfirstShow = true; + currSitData = list_Sits[roomJoinNotice.position]; + //currSitData.ChangeTurret(1); + } + else + { + JoinGame(roomJoinNotice.position, roomJoinNotice.gold, roomJoinNotice.cannonMultiple, 1); + + } + + + + + } else { @@ -443,5 +669,7 @@ public class GameMainPanel_XJMH : GameMainPanel_Base base.OnHide(); CreateFishManager.Instance.ExitRoom(); SceneManager.UnloadSceneAsync("XJMH"); + WebSocketSendList.LeaveRoom(GameManager.Instance.gameData.currRoomData.roomId,currSitData.user.id); + } } diff --git a/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab b/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab index 7fd7e0fc6..6e09f04b3 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab @@ -5699,7 +5699,6 @@ RectTransform: - {fileID: 4559688230590463030} - {fileID: 928710527401417714} - {fileID: 678913131303693655} - - {fileID: 1101226416299028320} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6189,147 +6188,3 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &1690871251616316941 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3182697402847799673} - m_Modifications: - - target: {fileID: 1291800488841944919, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_Name - value: 1District - objectReference: {fileID: 0} - - target: {fileID: 1445048545826174922, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_SizeDelta.x - value: 582 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_SizeDelta.y - value: 1017 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3213656400481786378, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3213656400481786378, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7647910538216301643, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad37004de2fb47f468b119a0b528ac78, type: 3} ---- !u!224 &1101226416299028320 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1747249211495485805, guid: ad37004de2fb47f468b119a0b528ac78, - type: 3} - m_PrefabInstance: {fileID: 1690871251616316941} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs index ac0dc0b96..baace50ea 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs @@ -50,10 +50,10 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase Hide(); }); - panel_RoomItemPrefab.onClick.AddListener(() => - { - GameManager.Instance.StartGame(); - }); + //panel_RoomItemPrefab.onClick.AddListener(() => + //{ + // GameManager.Instance.StartGame(); + //}); } private void Update() { @@ -67,7 +67,11 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase public override void Show(object args = null) { base.Show(args); - + foreach (var item in itemPage) + { + Destroy(item.gameObject); + } + itemPage.Clear(); text_PageNum.text = pageNum + "/" + itemPage.Count; panel_PanelParent.SetActive(false); if (args != null) @@ -91,6 +95,10 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase //itemListDic.Add Instantiate(panel_RoomItemPrefab, itemPage[(int)(i/15)-1]); var tran = Instantiate(panel_RoomItemPrefab.gameObject, itemPage[(int)(i / 15)]).transform; + tran.GetComponent