diff --git a/Assets/Scripts/Commands/Base.meta b/Assets/Scripts/Commands/Base.meta deleted file mode 100644 index 38ccc02de..000000000 --- a/Assets/Scripts/Commands/Base.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b1ed97690b508a34eb0403c02ede8823 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Commands/Base/CommandArgs.cs b/Assets/Scripts/Commands/Base/CommandArgs.cs deleted file mode 100644 index e6964a7d9..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgs.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace NBF -{ - public struct CommandArgsStruct - { - public override bool Equals(object obj) - { - return obj is CommandArgsStruct other && Equals(other); - } - - public override int GetHashCode() - { - return (Value != null ? Value.GetHashCode() : 0); - } - - private string Value { get; set; } - - public CommandArgsStruct(string val = "") - { - Value = val; - } - - public bool Equals(CommandArgsStruct other) - { - return Value == other.Value; - } - - public static bool operator ==(CommandArgsStruct a, CommandArgsStruct b) => a.Value == b.Value; - public static bool operator !=(CommandArgsStruct a, CommandArgsStruct b) => a.Value != b.Value; - - public override string ToString() => Value; - - public int ToInt() - { - return int.TryParse(Value, out var i) ? i : 0; - } - - public float ToFloat() - { - return float.TryParse(Value, out var i) ? i : 0; - } - - public T[] ToArr(string split = ",") where T : IConvertible - { - var arr = Value.Split(split); - return arr.Select(a => (T)Convert.ChangeType(a, typeof(T))).ToArray(); - } - } - - public class CommandArgs - { - public string Command { get; private set; } - - private readonly List _args = new List(); - - - public CommandArgs(string str) - { - _args.Clear(); - var args = str.Split(' '); - for (var i = 0; i < args.Length; i++) - { - if (i == 0) - { - Command = args[i]; - } - else - { - _args.Add(new CommandArgsStruct(args[i])); - } - } - } - - public CommandArgsStruct this[int index] => Get(index); - - public CommandArgsStruct Get(int index) - { - if (index < _args.Count && index >= 0) - { - return _args[index]; - } - - return new CommandArgsStruct(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/CommandArgs.cs.meta b/Assets/Scripts/Commands/Base/CommandArgs.cs.meta deleted file mode 100644 index e11c454d5..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgs.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b0a16abd7e144cbf8d1f9fbce9abbedc -timeCreated: 1687225439 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/CommandArgsRule.cs b/Assets/Scripts/Commands/Base/CommandArgsRule.cs deleted file mode 100644 index ea4206eca..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgsRule.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace NBF -{ - public struct CommandArgsRule - { - public string Sample; - - public string Tips; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/CommandArgsRule.cs.meta b/Assets/Scripts/Commands/Base/CommandArgsRule.cs.meta deleted file mode 100644 index 629df80ef..000000000 --- a/Assets/Scripts/Commands/Base/CommandArgsRule.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 9d1ccdbc0664467fa7f357204f86ba35 -timeCreated: 1687161149 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/ICommand.cs b/Assets/Scripts/Commands/Base/ICommand.cs deleted file mode 100644 index cfa79b40e..000000000 --- a/Assets/Scripts/Commands/Base/ICommand.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections.Generic; - -namespace NBF -{ - public interface ICommand - { - /// - /// 名字 - /// - string Name { get; } - - /// - /// 命令 - /// - string Command { get; } - - /// - /// 参数说明 - /// - string ArgsTips { get; } - - - /// - /// 执行 - /// - /// - bool Execute(CommandArgs args); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Base/ICommand.cs.meta b/Assets/Scripts/Commands/Base/ICommand.cs.meta deleted file mode 100644 index aa6c755ee..000000000 --- a/Assets/Scripts/Commands/Base/ICommand.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: c3245582eb204c4abb7a0aa1eb05a276 -timeCreated: 1687156371 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Command.cs b/Assets/Scripts/Commands/Command.cs deleted file mode 100644 index 01beff4b9..000000000 --- a/Assets/Scripts/Commands/Command.cs +++ /dev/null @@ -1,158 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NBC; - -namespace NBF -{ - public class Command - { - public enum LogType - { - Info, - Warn, - Error - } - - public struct LogData - { - public string Log; - public LogType Type; - - public LogData(string log, LogType type) - { - Log = log; - Type = type; - } - } - - private static readonly Dictionary _commands = new Dictionary(); - - #region Log - - public static readonly List Logs = new List(); - private const int MaxLog = 1000; - - public static Action OnLogChange; - - public static void LogInfo(string log) - { - AddLog(log, LogType.Info); - } - - public static void LogWarn(string log) - { - AddLog(log, LogType.Warn); - } - - public static void LogError(string log) - { - AddLog(log, LogType.Error); - } - - private static void AddLog(string log, LogType type) - { - if (Logs.Count > MaxLog) - { - var sub = Logs.Count - MaxLog; - for (int i = 0; i < sub; i++) - { - Logs.RemoveAt(0); - } - } - - Logs.Add(new LogData(log, type)); - OnLogChange?.Invoke(); - } - - #endregion - - /// - /// 反射所有GM命令 - /// - public static void Init() - { - try - { - var assembly = AppDomain.CurrentDomain.GetAssemblies() - .First(a => a.GetName().Name == "Assembly-CSharp"); - var type = typeof(ICommand); - var types = assembly.GetTypes(); - Log.Info("command 6"); - var commandTypes = - types.Where(u => type.IsAssignableFrom(u) && u.IsClass && !u.IsAbstract && !u.IsGenericType); - foreach (var c in commandTypes) - { - if (Activator.CreateInstance(c) is ICommand command) - { - _commands[command.Command] = command; - } - } - } - catch (Exception e) - { - Log.Error(e); - } - } - - public static void Open() - { - // UI.Inst.OpenUI(); - } - - public static void Close() - { - // UI.Inst.DestroyUI(); - } - - public static bool Has(string command) - { - return _commands.ContainsKey(command); - } - - /// - /// 获取所有指令实例 - /// - /// - public static List GetAll() - { - return _commands.Values.ToList(); - } - - public static ICommand Get(string command) - { - return _commands.GetValueOrDefault(command); - } - - /// - /// 执行命令 - /// - /// - /// - public static bool Run(string command) - { - var args = new CommandArgs(command); - var inst = Get(args.Command); - return inst?.Execute(args) ?? false; - } - - /// - /// 匹配相识的命令 - /// - /// - /// - public static List Match(string command) - { - var list = new List(); - foreach (var key in _commands.Keys) - { - if (key.Contains(command)) - { - list.Add(_commands[key]); - } - } - - return list; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Command.cs.meta b/Assets/Scripts/Commands/Command.cs.meta deleted file mode 100644 index 3e7adad64..000000000 --- a/Assets/Scripts/Commands/Command.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 18773de7af9f49208a6ff95a79c012c1 -timeCreated: 1732715884 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task.meta b/Assets/Scripts/Commands/Task.meta deleted file mode 100644 index dcadb20fa..000000000 --- a/Assets/Scripts/Commands/Task.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d5d78b5261ae4df48915147b01803839 -timeCreated: 1742568116 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/DefRunner.cs b/Assets/Scripts/Commands/Task/DefRunner.cs deleted file mode 100644 index 28ea6d60e..000000000 --- a/Assets/Scripts/Commands/Task/DefRunner.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using NBC; - -namespace NBF -{ - /// - /// 默认任务运行器 - /// - public class DefRunner : Runner - { - private static DefRunner mUpdateRunner; - public static DefRunner Scheduler => mUpdateRunner ??= new DefRunner(); - - private readonly List _updateRoutines = new List(); - - private static bool _pause; - - public event Action OnUpdate; - - /// - /// 暂停运行器 - /// - public static bool Pause - { - get => _pause; - set => _pause = value; - } - - public DefRunner() - { - App.OnUpdate += Update; - StartCoroutine(new RunnerProcess("DefRunner", Coroutines, ReadyTask, FlushingOperation)); - } - - private void StartCoroutine(IProcess process) - { - var routines = _updateRoutines; - if (!routines.Contains(process)) - { - routines.Add(process); - } - } - - private void Update() - { - if (Pause) return; - ExecuteRoutines(_updateRoutines); - OnUpdate?.Invoke(); - } - - private void ExecuteRoutines(List arr) - { - if (arr != null && arr.Count > 0) - { - for (var index = 0; index < arr.Count; index++) - { - var task = arr[index]; - var st = task.Process(); - if (st == NTaskStatus.Success) - { - arr.RemoveAt(index); - index--; - } - } - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/DefRunner.cs.meta b/Assets/Scripts/Commands/Task/DefRunner.cs.meta deleted file mode 100644 index 51788d959..000000000 --- a/Assets/Scripts/Commands/Task/DefRunner.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b32a3d1556f74b3390f54b8e355199c0 -timeCreated: 1742568119 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/LoadSceneTask.cs b/Assets/Scripts/Commands/Task/LoadSceneTask.cs deleted file mode 100644 index 05ce031bb..000000000 --- a/Assets/Scripts/Commands/Task/LoadSceneTask.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using NBC; -using NBC.Asset; -using UnityEngine; -using UnityEngine.SceneManagement; - -namespace NBF -{ - public class LoadSceneTask : NTask - { - public LoadSceneTask(string sceneName, Action addAssetCallback = null) - { - _sceneName = sceneName; - _addAssetCallback = addAssetCallback; - } - - private readonly Action _addAssetCallback; - private readonly string _sceneName; - // private SceneProvider _sceneAsset; - private AsyncOperation _asyncOperation; - - protected override void OnStart() - { - Log.Info($"加载场景=={_sceneName}"); - // var scenePath = $"scene/{_sceneName}"; - _asyncOperation = SceneManager.LoadSceneAsync(_sceneName); - // _sceneAsset = NBC.Asset.Assets.LoadScene(scenePath); - // Assets.StompyRobot.SRDebugger.Scripts.Services.Implementation.ConsoleFilterStateService - } - - protected override NTaskStatus OnProcess() - { - // if (_sceneAsset != null) - // { - // if (_sceneAsset.IsDone) - // { - // if (_addAssetCallback != null) - // { - // _addAssetCallback(_sceneAsset); //加入缓存，以便离开战斗释放 - // } - // - // _addAssetCallback?.Invoke(_sceneAsset); - // return NTaskStatus.Success; - // } - // } - - if (_asyncOperation != null) - { - if (_asyncOperation.isDone) - { - // if (_addAssetCallback != null) - // { - // _addAssetCallback(_sceneAsset); //加入缓存，以便离开战斗释放 - // } - // - // _addAssetCallback?.Invoke(_sceneAsset); - return NTaskStatus.Success; - } - } - - return NTaskStatus.Running; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/LoadSceneTask.cs.meta b/Assets/Scripts/Commands/Task/LoadSceneTask.cs.meta deleted file mode 100644 index 799e217bd..000000000 --- a/Assets/Scripts/Commands/Task/LoadSceneTask.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: dc1ed1d2970444c2ba57d03aa15ab745 -timeCreated: 1742568127 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/RunFunTask.cs b/Assets/Scripts/Commands/Task/RunFunTask.cs deleted file mode 100644 index ea0f4e0d5..000000000 --- a/Assets/Scripts/Commands/Task/RunFunTask.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using NBC; - -namespace NBF -{ - public class RunFunTask : NTask - { - private readonly Action _action; - - public RunFunTask(Action action) - { - _action = action; - } - - protected override void OnStart() - { - _action?.Invoke(); - Finish(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/RunFunTask.cs.meta b/Assets/Scripts/Commands/Task/RunFunTask.cs.meta deleted file mode 100644 index df1000af3..000000000 --- a/Assets/Scripts/Commands/Task/RunFunTask.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 16e933b27204495bbb32d82177abb975 -timeCreated: 1742568135 \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/TimeStopTask.cs b/Assets/Scripts/Commands/Task/TimeStopTask.cs deleted file mode 100644 index 56d03d8e3..000000000 --- a/Assets/Scripts/Commands/Task/TimeStopTask.cs +++ /dev/null @@ -1,45 +0,0 @@ -using NBC; -using UnityEngine; - -namespace NBF -{ - public class TimeStopTask : NTask - { - //public float ProcessTime = 0; - public float EndTime = 0; - - public float StartTime = 0; - - private float _time; - - public TimeStopTask(float time) - { - _time = time; - } - - public override void Reset() - { - // EndTime = 0; - // StartTime = 0; - } - - public override void Stop() - { - // ProcessTime = EndTime; - - EndTime = 0; - StartTime = 0; - } - - protected override void OnStart() - { - StartTime = Time.time; - EndTime = StartTime + _time; - } - - protected override NTaskStatus OnProcess() - { - return Time.time > EndTime ? NTaskStatus.Success : NTaskStatus.Running; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Commands/Task/TimeStopTask.cs.meta b/Assets/Scripts/Commands/Task/TimeStopTask.cs.meta deleted file mode 100644 index 4d897d1b3..000000000 --- a/Assets/Scripts/Commands/Task/TimeStopTask.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: aeb0973aa0bd4cdf9f025faed8a48959 -timeCreated: 1742568141 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity.meta b/Assets/Scripts/Fishing2/Entity.meta new file mode 100644 index 000000000..9f6fe3988 --- /dev/null +++ b/Assets/Scripts/Fishing2/Entity.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 664b8188498e48b7875266cd768c4b23 +timeCreated: 1756305288 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Entity/Data.meta b/Assets/Scripts/Fishing2/Entity/Data.meta new file mode 100644 index 000000000..2461d28c1 --- /dev/null +++ b/Assets/Scripts/Fishing2/Entity/Data.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3aca1b3b8c2e4ef38cb2c4e0759f5620 +timeCreated: 1756305296 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Map.meta b/Assets/Scripts/Fishing2/Entity/Data/Map.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Map.meta rename to Assets/Scripts/Fishing2/Entity/Data/Map.meta diff --git a/Assets/Scripts/Fishing2/Model/Map/Map.cs b/Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Map/Map.cs rename to Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs diff --git a/Assets/Scripts/Fishing2/Model/Map/Map.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Map/Map.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Map/Map.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Move.meta b/Assets/Scripts/Fishing2/Entity/Data/Move.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Move.meta rename to Assets/Scripts/Fishing2/Entity/Data/Move.meta diff --git a/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Move/MoveComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Move/MoveComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBaitComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBaitComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearBobberComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearBobberComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearHookComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearHookComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLineComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLineComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearLureComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearLureComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearReelComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearReelComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearRodComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearRodComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/Child/GearWeightComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/Child/GearWeightComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Gear/UnitGearComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Gear/UnitGearComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Parts.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Parts.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Parts.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Parts/UnitFlashlightComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Parts/UnitFlashlightComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Skin.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Skin.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Skin.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Skin/UnitSkinComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Skin/UnitSkinComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/Unit.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Unit.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/Unit.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/Unit.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/Unit.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitBasic.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitBasic.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitEventType.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitEventType.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs diff --git a/Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs.meta b/Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Unit/UnitStateArgs.cs.meta rename to Assets/Scripts/Fishing2/Entity/Data/Unit/UnitStateArgs.cs.meta diff --git a/Assets/Scripts/Fishing2/Entity/View.meta b/Assets/Scripts/Fishing2/Entity/View.meta new file mode 100644 index 000000000..80f84625c --- /dev/null +++ b/Assets/Scripts/Fishing2/Entity/View.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 944bb9e5d3fe4517bc6d12f723f98f87 +timeCreated: 1756305300 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Views/Unit.meta b/Assets/Scripts/Fishing2/Entity/View/Unit.meta similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit.meta rename to Assets/Scripts/Fishing2/Entity/View/Unit.meta diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitHUDComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs diff --git a/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta b/Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta rename to Assets/Scripts/Fishing2/Entity/View/Unit/UnitUnityComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Event.meta b/Assets/Scripts/Fishing2/Event.meta new file mode 100644 index 000000000..8e64e000f --- /dev/null +++ b/Assets/Scripts/Fishing2/Event.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 958c7de8b9234f129e1ce439a961d540 +timeCreated: 1756305421 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/LoginFinish.cs b/Assets/Scripts/Fishing2/Event/LoginFinish.cs similarity index 100% rename from Assets/Scripts/Fishing2/LoginFinish.cs rename to Assets/Scripts/Fishing2/Event/LoginFinish.cs diff --git a/Assets/Scripts/Fishing2/LoginFinish.cs.meta b/Assets/Scripts/Fishing2/Event/LoginFinish.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/LoginFinish.cs.meta rename to Assets/Scripts/Fishing2/Event/LoginFinish.cs.meta diff --git a/Assets/Scripts/Fishing2/Model.meta b/Assets/Scripts/Fishing2/Model.meta index 49aaa69d4..c5446964f 100644 --- a/Assets/Scripts/Fishing2/Model.meta +++ b/Assets/Scripts/Fishing2/Model.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: fe99d0fb1bfc4912a205bb00911c1132 -timeCreated: 1756047069 \ No newline at end of file +guid: 78d510036c864fc6a7840f354a743ce0 +timeCreated: 1756305355 \ No newline at end of file diff --git a/Assets/Scripts/Data.meta b/Assets/Scripts/Fishing2/Model/Data.meta similarity index 100% rename from Assets/Scripts/Data.meta rename to Assets/Scripts/Fishing2/Model/Data.meta diff --git a/Assets/Scripts/Data/TabListData.cs b/Assets/Scripts/Fishing2/Model/Data/TabListData.cs similarity index 100% rename from Assets/Scripts/Data/TabListData.cs rename to Assets/Scripts/Fishing2/Model/Data/TabListData.cs diff --git a/Assets/Scripts/Data/TabListData.cs.meta b/Assets/Scripts/Fishing2/Model/Data/TabListData.cs.meta similarity index 100% rename from Assets/Scripts/Data/TabListData.cs.meta rename to Assets/Scripts/Fishing2/Model/Data/TabListData.cs.meta diff --git a/Assets/Scripts/Def.meta b/Assets/Scripts/Fishing2/Model/Def.meta similarity index 100% rename from Assets/Scripts/Def.meta rename to Assets/Scripts/Fishing2/Model/Def.meta diff --git a/Assets/Scripts/Def/GameDef.cs b/Assets/Scripts/Fishing2/Model/Def/GameDef.cs similarity index 100% rename from Assets/Scripts/Def/GameDef.cs rename to Assets/Scripts/Fishing2/Model/Def/GameDef.cs diff --git a/Assets/Scripts/Def/GameDef.cs.meta b/Assets/Scripts/Fishing2/Model/Def/GameDef.cs.meta similarity index 100% rename from Assets/Scripts/Def/GameDef.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/GameDef.cs.meta diff --git a/Assets/Scripts/Def/InputDef.cs b/Assets/Scripts/Fishing2/Model/Def/InputDef.cs similarity index 100% rename from Assets/Scripts/Def/InputDef.cs rename to Assets/Scripts/Fishing2/Model/Def/InputDef.cs diff --git a/Assets/Scripts/Def/InputDef.cs.meta b/Assets/Scripts/Fishing2/Model/Def/InputDef.cs.meta similarity index 100% rename from Assets/Scripts/Def/InputDef.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/InputDef.cs.meta diff --git a/Assets/Scripts/Def/SelectorRodSetting.cs b/Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs similarity index 100% rename from Assets/Scripts/Def/SelectorRodSetting.cs rename to Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs diff --git a/Assets/Scripts/Def/SelectorRodSetting.cs.meta b/Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs.meta similarity index 100% rename from Assets/Scripts/Def/SelectorRodSetting.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/SelectorRodSetting.cs.meta diff --git a/Assets/Scripts/Def/States.cs b/Assets/Scripts/Fishing2/Model/Def/States.cs similarity index 100% rename from Assets/Scripts/Def/States.cs rename to Assets/Scripts/Fishing2/Model/Def/States.cs diff --git a/Assets/Scripts/Def/States.cs.meta b/Assets/Scripts/Fishing2/Model/Def/States.cs.meta similarity index 100% rename from Assets/Scripts/Def/States.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/States.cs.meta diff --git a/Assets/Scripts/Def/UIDef.cs b/Assets/Scripts/Fishing2/Model/Def/UIDef.cs similarity index 100% rename from Assets/Scripts/Def/UIDef.cs rename to Assets/Scripts/Fishing2/Model/Def/UIDef.cs diff --git a/Assets/Scripts/Def/UIDef.cs.meta b/Assets/Scripts/Fishing2/Model/Def/UIDef.cs.meta similarity index 100% rename from Assets/Scripts/Def/UIDef.cs.meta rename to Assets/Scripts/Fishing2/Model/Def/UIDef.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/MapManageComponent.cs b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs new file mode 100644 index 000000000..40aa0b937 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs @@ -0,0 +1,9 @@ +using NBC.Entitas; + +namespace NBF.Fishing2 +{ + public class MapManageComponent : Entity + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta new file mode 100644 index 000000000..ce673d40d --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/MapManageComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 226c840e80f840ae8a4ff54bc7c6645a +timeCreated: 1756304063 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module.meta b/Assets/Scripts/Fishing2/Model/Module.meta new file mode 100644 index 000000000..8b0973fa8 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e4e83bf905244f99b0c583bf307cdbca +timeCreated: 1756310423 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module/Numeric.meta b/Assets/Scripts/Fishing2/Model/Module/Numeric.meta new file mode 100644 index 000000000..74cf16c94 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/Numeric.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ddc41e806352498aad45983600bdce6d +timeCreated: 1756310441 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericComponent.cs.meta rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericComponent.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs diff --git a/Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs.meta b/Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/Model/Numeric/NumericType.cs.meta rename to Assets/Scripts/Fishing2/Model/Module/Numeric/NumericType.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta b/Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta new file mode 100644 index 000000000..7d2c4b2de --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/ObjectWait.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3c2510352b1145bcaedaddbce324c10d +timeCreated: 1756310429 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs new file mode 100644 index 000000000..705e457dd --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs @@ -0,0 +1,144 @@ +using System; +using System.Collections.Generic; +using NBC; +using NBC.Entitas; +using NBC.Entitas.Interface; + +namespace NBF.Fishing2 +{ + public static class WaitTypeError + { + public const int Success = 0; + public const int Destroy = 1; + public const int Cancel = 2; + public const int Timeout = 3; + } + + public interface IWaitType + { + int Error { get; set; } + } + + + public class ObjectWait : Entity + { + public Dictionary> tcsDict = new(); + } + + + public static class ObjectWaitSystem + { + public class ObjectWaitAwakeSystem : AwakeSystem + { + protected override void Awake(ObjectWait self) + { + self.tcsDict.Clear(); + } + } + + public class ObjectWaitDestroySystem : DestroySystem + { + protected override void Destroy(ObjectWait self) + { + foreach (var p in self.tcsDict) + { + foreach (object v in p.Value) + { + ((IDestroyRun)v).SetResult(); + } + } + + self.tcsDict.Clear(); + } + } + + private interface IDestroyRun + { + void SetResult(); + } + + private class ResultCallback : IDestroyRun where K : struct, IWaitType + { + private FTask tcs; + + public ResultCallback() + { + this.tcs = FTask.Create(true); + } + + public bool IsDisposed + { + get { return this.tcs == null; } + } + + public FTask Task => this.tcs; + + public void SetResult(K k) + { + var t = tcs; + this.tcs = null; + t.SetResult(k); + } + + public void SetResult() + { + var t = tcs; + this.tcs = null; + t.SetResult(new K() { Error = WaitTypeError.Destroy }); + } + } + + public static async FTask Wait(this ObjectWait self) where T : struct, IWaitType + { + ResultCallback tcs = new ResultCallback(); + FCancellationToken cancellationToken = FCancellationToken.ToKen; + self.Add(typeof(T), tcs); + + T ret; + try + { + cancellationToken?.Add(CancelAction); + ret = await tcs.Task; + } + finally + { + cancellationToken?.Remove(CancelAction); + } + + return ret; + + void CancelAction() + { + self.Notify(new T() { Error = WaitTypeError.Cancel }); + } + } + + public static void Notify(this ObjectWait self, T obj) where T : struct, IWaitType + { + Type type = typeof(T); + if (!self.tcsDict.TryGetValue(type, out var tcsList) || tcsList.Count == 0) + { + return; + } + + foreach (var tcs in tcsList) + { + ((ResultCallback)tcs).SetResult(obj); + } + + tcsList.Clear(); + } + + private static void Add(this ObjectWait self, Type type, object obj) + { + if (self.tcsDict.TryGetValue(type, out var list)) + { + list.Add(obj); + } + else + { + self.tcsDict.Add(type, new List { obj }); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta new file mode 100644 index 000000000..604fa5e86 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Module/ObjectWait/ObjectWait.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a79150f39b424a1c82eef6b04bc0a7c1 +timeCreated: 1756310098 \ No newline at end of file diff --git a/Assets/Scripts/Net.meta b/Assets/Scripts/Fishing2/Model/Net.meta similarity index 100% rename from Assets/Scripts/Net.meta rename to Assets/Scripts/Fishing2/Model/Net.meta diff --git a/Assets/Scripts/Net/Entity.meta b/Assets/Scripts/Fishing2/Model/Net/Entity.meta similarity index 100% rename from Assets/Scripts/Net/Entity.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity.meta diff --git a/Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs b/Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs similarity index 100% rename from Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs rename to Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs diff --git a/Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs.meta similarity index 100% rename from Assets/Scripts/Net/Entity/AuthenticationSelectComponent.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity/AuthenticationSelectComponent.cs.meta diff --git a/Assets/Scripts/Net/Entity/JWT.meta b/Assets/Scripts/Fishing2/Model/Net/Entity/JWT.meta similarity index 100% rename from Assets/Scripts/Net/Entity/JWT.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity/JWT.meta diff --git a/Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs b/Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs similarity index 100% rename from Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs rename to Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs diff --git a/Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs.meta similarity index 100% rename from Assets/Scripts/Net/Entity/JWT/JWTParseComponent.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Entity/JWT/JWTParseComponent.cs.meta diff --git a/Assets/Scripts/Net/Hotfix.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix.meta diff --git a/Assets/Scripts/Net/Hotfix/.DS_Store b/Assets/Scripts/Fishing2/Model/Net/Hotfix/.DS_Store similarity index 100% rename from Assets/Scripts/Net/Hotfix/.DS_Store rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/.DS_Store diff --git a/Assets/Scripts/Net/Hotfix/Handler.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/Handler.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler.meta diff --git a/Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs diff --git a/Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs.meta diff --git a/Assets/Scripts/Net/Hotfix/System.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System.meta diff --git a/Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs diff --git a/Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs.meta diff --git a/Assets/Scripts/Net/Hotfix/System/JWT.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/JWT.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT.meta diff --git a/Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs diff --git a/Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs.meta diff --git a/Assets/Scripts/Net/Hotfix/System/SessionHelper.cs b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/SessionHelper.cs rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs diff --git a/Assets/Scripts/Net/Hotfix/System/SessionHelper.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs.meta similarity index 100% rename from Assets/Scripts/Net/Hotfix/System/SessionHelper.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Hotfix/System/SessionHelper.cs.meta diff --git a/Assets/Scripts/Net/MessageHandler.meta b/Assets/Scripts/Fishing2/Model/Net/MessageHandler.meta similarity index 100% rename from Assets/Scripts/Net/MessageHandler.meta rename to Assets/Scripts/Fishing2/Model/Net/MessageHandler.meta diff --git a/Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs similarity index 100% rename from Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs rename to Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs diff --git a/Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs.meta b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta similarity index 100% rename from Assets/Scripts/Net/MessageHandler/Chat2C_MessageHandler.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/MessageHandler/Chat2C_MessageHandler.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs new file mode 100644 index 000000000..70b04c1b4 --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs @@ -0,0 +1,24 @@ +using NBC; +using NBC.Network; +using NBC.Network.Interface; +using NBF.Fishing2; + +namespace NBF +{ + public class Map2C_ChangeMapHandler : Message + { + protected override async FTask Run(Session session, Map2C_ChangeMap message) + { + Log.Info($"收到地图切换消息=={message.MapId}"); + await MapHelper.CreateRoomTest(message.MapId); + } + } + // public class Map2C_ChangeMapHandler : Message + // { + // protected override async FTask Run(Session session, Map2C_ChangeMap message) + // { + // Log.Info($"收到地图切换消息=={message.MapId}"); + // await MapHelper.CreateRoomTest(message.MapId); + // } + // } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta new file mode 100644 index 000000000..c1776a44f --- /dev/null +++ b/Assets/Scripts/Fishing2/Model/Net/MessageHandler/Map2C_ChangeMapHandler.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9aca13592484450582e818dd128a23c2 +timeCreated: 1756301493 \ No newline at end of file diff --git a/Assets/Scripts/Net/Net.cs b/Assets/Scripts/Fishing2/Model/Net/Net.cs similarity index 100% rename from Assets/Scripts/Net/Net.cs rename to Assets/Scripts/Fishing2/Model/Net/Net.cs diff --git a/Assets/Scripts/Net/Net.cs.meta b/Assets/Scripts/Fishing2/Model/Net/Net.cs.meta similarity index 100% rename from Assets/Scripts/Net/Net.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/Net.cs.meta diff --git a/Assets/Scripts/Net/NetExtends.cs b/Assets/Scripts/Fishing2/Model/Net/NetExtends.cs similarity index 100% rename from Assets/Scripts/Net/NetExtends.cs rename to Assets/Scripts/Fishing2/Model/Net/NetExtends.cs diff --git a/Assets/Scripts/Net/NetExtends.cs.meta b/Assets/Scripts/Fishing2/Model/Net/NetExtends.cs.meta similarity index 100% rename from Assets/Scripts/Net/NetExtends.cs.meta rename to Assets/Scripts/Fishing2/Model/Net/NetExtends.cs.meta diff --git a/Assets/Scripts/Fishing2/Model/Numeric.meta b/Assets/Scripts/Fishing2/Model/Numeric.meta deleted file mode 100644 index 04782f7a4..000000000 --- a/Assets/Scripts/Fishing2/Model/Numeric.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2859b0361c964635b4ea58be3b903b6a -timeCreated: 1756115131 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs new file mode 100644 index 000000000..1aa5b0379 --- /dev/null +++ b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs @@ -0,0 +1,19 @@ +using NBC; +using NBC.Event; + +namespace NBF.Fishing2 +{ + public class OnSceneCreate_Init : AsyncEventSystem + { + protected override async FTask Handler(OnCreateScene self) + { + var scene = self.Scene; + if (scene.SceneRuntimeType == SceneRuntimeType.Root) + { + Log.Info("OnSceneCreate_Init=== root"); + scene.AddComponent(); + scene.AddComponent(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta new file mode 100644 index 000000000..e6a23bb56 --- /dev/null +++ b/Assets/Scripts/Fishing2/OnSceneCreate_Init.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c155820b018048fab4bcdb1aa3b7442a +timeCreated: 1756310186 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs b/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs deleted file mode 100644 index 3f020075e..000000000 --- a/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using NBC; - -namespace NBF.Fishing2 -{ - public static class MapHelper - { - /// - /// 开始进入地图 - /// - public static async FTask Enter(int mapId, long roomId = 0) - { - var response = (Map2C_EnterMapResponse)await Net.Call(new C2Map_EnterMapRequest() - { - MapId = mapId, - RoomId = roomId - }); - Log.Info($"创建房间请求返回={response.MapId}"); - - if (response.MapId > 0) - { - var roomResponse = (Map2C_CreateRoomResponse)await Net.Call(new C2Map_CreateRoomRequest() - { - MapId = response.MapId - }); - Log.Info($"创建房间返回 Code={roomResponse.RoomCode} 房间玩家数量={roomResponse.Units.Count}"); - - //执行进入房间 - var roomResponse2 = (G2C_EnterRoomResponse)await Net.Call(new C2G_EnterRoomRequest() - { - RoomCode = roomResponse.RoomCode - }); - Log.Info($"进入房间返回 Code={roomResponse2.RoomCode} 房间玩家数量={roomResponse2.Units.Count}"); - } - - await FTask.CompletedTask; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Helper.meta b/Assets/Scripts/Fishing2/System/Helper.meta new file mode 100644 index 000000000..d8f9d4b56 --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Helper.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8de8645248d34ebfaf351bc67a8b8a45 +timeCreated: 1756309950 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs b/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs new file mode 100644 index 000000000..1b06e3f1a --- /dev/null +++ b/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs @@ -0,0 +1,38 @@ +using NBC; + +namespace NBF.Fishing2 +{ + public static class MapHelper + { + /// + /// 开始进入地图 + /// + public static async FTask Enter(int mapId, long roomId = 0) + { + var response = (Map2C_EnterMapResponse)await Net.Call(new C2Map_EnterMapRequest() + { + MapId = mapId, + RoomId = roomId + }); + Log.Info($"进入房间请求返回={response.ErrorCode}"); + + await FTask.CompletedTask; + } + + public static async FTask CreateRoomTest(int mapId) + { + // var roomResponse = (Map2C_CreateRoomResponse)await Net.Call(new C2Map_CreateRoomRequest() + // { + // MapId = mapId + // }); + // Log.Info($"创建房间返回 Code={roomResponse.RoomCode} 房间玩家数量={roomResponse.Units.Count}"); + // + // //执行进入房间 + // var roomResponse2 = (G2C_EnterRoomResponse)await Net.Call(new C2G_EnterRoomRequest() + // { + // RoomCode = roomResponse.RoomCode + // }); + // Log.Info($"进入房间返回 Code={roomResponse2.RoomCode} 房间玩家数量={roomResponse2.Units.Count}"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs.meta b/Assets/Scripts/Fishing2/System/Helper/MapHelper.cs.meta similarity index 100% rename from Assets/Scripts/Fishing2/System/Data/Map/MapHelper.cs.meta rename to Assets/Scripts/Fishing2/System/Helper/MapHelper.cs.meta diff --git a/Assets/Scripts/Fishing2/Views.meta b/Assets/Scripts/Fishing2/Views.meta deleted file mode 100644 index 7e5375042..000000000 --- a/Assets/Scripts/Fishing2/Views.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: fb1bae7c41874855957fe654dec2dee5 -timeCreated: 1755792325 \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs index 9d982cebb..be73a13ab 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs @@ -201,4 +201,30 @@ namespace NBC [ProtoMember(1)] public uint ErrorCode { get; set; } } + /// + /// 通知客户端切换地图 + /// + [ProtoContract] + public partial class Map2C_ChangeMap : AMessage, ICustomRouteMessage, IProto + { + public static Map2C_ChangeMap Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + MapId = default; + Node = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_ChangeMap; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public int Node { get; set; } + } } diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs index 92539d361..d893fbd31 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs @@ -121,30 +121,6 @@ namespace NBC } public uint OpCode() { return OuterOpcode.G2C_RepeatLogin; } } - /// - /// 通知客户端切换地图 - /// - [ProtoContract] - public partial class G2C_ChangeMap : AMessage, IMessage, IProto - { - public static G2C_ChangeMap Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - MapId = default; - Node = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.G2C_ChangeMap; } - [ProtoMember(1)] - public int MapId { get; set; } - [ProtoMember(2)] - public int Node { get; set; } - } [ProtoContract] public partial class C2Game_GetRoleInfoRequest : AMessage, ICustomRouteRequest, IProto { diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs index 0936072f1..99f79130d 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs @@ -10,37 +10,37 @@ namespace Fantasy public const uint G2C_ExitRoomResponse = 402663186; public const uint C2Map_EnterMapRequest = 2281711378; public const uint Map2C_EnterMapResponse = 2415929106; + public const uint Map2C_ChangeMap = 2147493649; public const uint C2A_LoginRequest = 268445459; public const uint A2C_LoginResponse = 402663187; public const uint C2G_LoginRequest = 268445460; public const uint G2C_LoginResponse = 402663188; public const uint G2C_RepeatLogin = 134227729; - public const uint G2C_ChangeMap = 134227730; public const uint C2Game_GetRoleInfoRequest = 2281711379; public const uint Game2C_GetRoleInfoResponse = 2415929107; public const uint C2Map_EnterRoomRequest = 2281711380; public const uint Map2C_EnterRoomResponse = 2415929108; - public const uint C2Map_Move = 2147493649; - public const uint Map2C_RoleEnterMapNotify = 2147493650; - public const uint Map2C_RoleExitMapNotify = 2147493651; - public const uint Map2C_RoleStateNotify = 2147493652; - public const uint Map2C_RoleGearStateNotify = 2147493653; - public const uint Map2C_RoleGearChangeNotify = 2147493654; + public const uint C2Map_Move = 2147493650; + public const uint Map2C_RoleEnterMapNotify = 2147493651; + public const uint Map2C_RoleExitMapNotify = 2147493652; + public const uint Map2C_RoleStateNotify = 2147493653; + public const uint Map2C_RoleGearStateNotify = 2147493654; + public const uint Map2C_RoleGearChangeNotify = 2147493655; public const uint C2S_GetConversationsRequest = 2281711381; public const uint S2C_GetConversationsResponse = 2415929109; public const uint C2S_SendMailRequest = 2281711382; public const uint S2C_SendMailResponse = 2415929110; public const uint C2S_DeleteMailRequest = 2281711383; public const uint S2C_DeleteMailResponse = 2415929111; - public const uint S2C_HaveMail = 2147493655; - public const uint S2C_MailState = 2147493656; + public const uint S2C_HaveMail = 2147493656; + public const uint S2C_MailState = 2147493657; public const uint C2S_CreateChannelRequest = 2281711384; public const uint S2C_CreateChannelResponse = 2415929112; public const uint C2S_JoinChannelRequest = 2281711385; public const uint S2C_JoinChannelResponse = 2415929113; public const uint C2S_SendMessageRequest = 2281711386; public const uint S2C_SendMessageResponse = 2415929114; - public const uint S2C_Message = 2147493657; + public const uint S2C_Message = 2147493658; public const uint C2S_CreateClubRequest = 2281711387; public const uint S2C_CreateClubResponse = 2415929115; public const uint C2S_GetClubInfoRequest = 2281711388; @@ -57,6 +57,6 @@ namespace Fantasy public const uint S2C_DissolveClubResponse = 2415929121; public const uint C2S_DisposeJoinRequest = 2281711394; public const uint S2C_DisposeJoinResponse = 2415929122; - public const uint S2C_ClubChange = 2147493658; + public const uint S2C_ClubChange = 2147493659; } } diff --git a/Assets/Scripts/Models.meta b/Assets/Scripts/Models.meta deleted file mode 100644 index 584945cf8..000000000 --- a/Assets/Scripts/Models.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: da30585f90994af6ae4bd327c567c7c6 -timeCreated: 1744118103 \ No newline at end of file diff --git a/Assets/Scripts/Models/RoleModel.cs b/Assets/Scripts/Models/RoleModel.cs deleted file mode 100644 index 0a1dbfd49..000000000 --- a/Assets/Scripts/Models/RoleModel.cs +++ /dev/null @@ -1,25 +0,0 @@ -using NBC; - -namespace NBF -{ - public class GameModel - { - public static int RoleID = 100; - - private static GameModel _inst; - - public static GameModel Inst => _inst ??= new GameModel(); - - public void Init() - { - } - - public void Clear() - { - } - - public void Destroy() - { - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Models/RoleModel.cs.meta b/Assets/Scripts/Models/RoleModel.cs.meta deleted file mode 100644 index 1014d88da..000000000 --- a/Assets/Scripts/Models/RoleModel.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 1a78e8aaa28b4c309c266b9166f21103 -timeCreated: 1744118125 \ No newline at end of file diff --git a/Assets/Scripts/PhysicsTools.zip b/Assets/Scripts/PhysicsTools.zip deleted file mode 100644 index 29fb9c40a..000000000 Binary files a/Assets/Scripts/PhysicsTools.zip and /dev/null differ diff --git a/Assets/Scripts/PhysicsTools.zip.meta b/Assets/Scripts/PhysicsTools.zip.meta deleted file mode 100644 index 12eb22b90..000000000 --- a/Assets/Scripts/PhysicsTools.zip.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2684716fa91d0e444a710242e2db2f9b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Startup/Init.cs b/Assets/Scripts/Startup/Init.cs index 80923b9fa..a12b87f87 100644 --- a/Assets/Scripts/Startup/Init.cs +++ b/Assets/Scripts/Startup/Init.cs @@ -146,8 +146,6 @@ namespace NBF { ConfigAssets.Init(); - GameModel.Inst.Init(); - // var inventoryManager = GetComponent(); // if (inventoryManager == null) // { diff --git a/Assets/Scripts/Steamworks.NET.meta b/Assets/Scripts/Steamworks.NET.meta deleted file mode 100644 index bbf13f6de..000000000 --- a/Assets/Scripts/Steamworks.NET.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 62ddefd95a62cbc4ea1a2aabc009a378 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Scripts/ThirdParty.meta b/Assets/Scripts/ThirdParty.meta new file mode 100644 index 000000000..3a2509145 --- /dev/null +++ b/Assets/Scripts/ThirdParty.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0d5240b076704b1bbb038b3b63867968 +timeCreated: 1756305119 \ No newline at end of file diff --git a/Assets/Scripts/FirstPersonController.meta b/Assets/Scripts/ThirdParty/FirstPersonController.meta similarity index 100% rename from Assets/Scripts/FirstPersonController.meta rename to Assets/Scripts/ThirdParty/FirstPersonController.meta diff --git a/Assets/Scripts/FirstPersonController/FirstPersonController.cs b/Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/FirstPersonController.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs diff --git a/Assets/Scripts/FirstPersonController/FirstPersonController.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/FirstPersonController.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/FirstPersonController.cs.meta diff --git a/Assets/Scripts/FirstPersonController/MouseLook.cs b/Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/MouseLook.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs diff --git a/Assets/Scripts/FirstPersonController/MouseLook.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/MouseLook.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/MouseLook.cs.meta diff --git a/Assets/Scripts/FirstPersonController/Utility.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility.meta diff --git a/Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs diff --git a/Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/CurveControlledBob.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/CurveControlledBob.cs.meta diff --git a/Assets/Scripts/FirstPersonController/Utility/FOVKick.cs b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/FOVKick.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs diff --git a/Assets/Scripts/FirstPersonController/Utility/FOVKick.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/FOVKick.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/FOVKick.cs.meta diff --git a/Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs diff --git a/Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs.meta b/Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs.meta similarity index 100% rename from Assets/Scripts/FirstPersonController/Utility/LerpControlledBob.cs.meta rename to Assets/Scripts/ThirdParty/FirstPersonController/Utility/LerpControlledBob.cs.meta diff --git a/Assets/Scripts/PhysicsTools.meta b/Assets/Scripts/ThirdParty/PhysicsTools.meta similarity index 100% rename from Assets/Scripts/PhysicsTools.meta rename to Assets/Scripts/ThirdParty/PhysicsTools.meta diff --git a/Assets/Scripts/PhysicsTools/Bezier.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Bezier.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs diff --git a/Assets/Scripts/PhysicsTools/Bezier.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Bezier.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Bezier.cs.meta diff --git a/Assets/Scripts/PhysicsTools/BoneSegment.cs b/Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/BoneSegment.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs diff --git a/Assets/Scripts/PhysicsTools/BoneSegment.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/BoneSegment.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/BoneSegment.cs.meta diff --git a/Assets/Scripts/PhysicsTools/ControlPoint.cs b/Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/ControlPoint.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs diff --git a/Assets/Scripts/PhysicsTools/ControlPoint.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/ControlPoint.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/ControlPoint.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Joint.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Joint.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs diff --git a/Assets/Scripts/PhysicsTools/Joint.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Joint.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Joint.cs.meta diff --git a/Assets/Scripts/PhysicsTools/JointProperties.cs b/Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/JointProperties.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs diff --git a/Assets/Scripts/PhysicsTools/JointProperties.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/JointProperties.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/JointProperties.cs.meta diff --git a/Assets/Scripts/PhysicsTools/LinkMesh.cs b/Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/LinkMesh.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs diff --git a/Assets/Scripts/PhysicsTools/LinkMesh.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/LinkMesh.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/LinkMesh.cs.meta diff --git a/Assets/Scripts/PhysicsTools/PosOri.cs b/Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/PosOri.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs diff --git a/Assets/Scripts/PhysicsTools/PosOri.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/PosOri.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/PosOri.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Rope.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Rope.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs diff --git a/Assets/Scripts/PhysicsTools/Rope.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Rope.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Rope.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SCapsulePos.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SCapsulePos.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs diff --git a/Assets/Scripts/PhysicsTools/SCapsulePos.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SCapsulePos.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SCapsulePos.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Segment.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Segment.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs diff --git a/Assets/Scripts/PhysicsTools/Segment.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Segment.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Segment.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentProperties.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentProperties.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentProperties.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentProperties.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentProperties.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBase.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBase.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesBox.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesBox.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs diff --git a/Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SegmentPropertiesCylinder.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SegmentPropertiesCylinder.cs.meta diff --git a/Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs b/Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs diff --git a/Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/SerializedSoftJointLimitSpring.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Utility.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Utility.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs diff --git a/Assets/Scripts/PhysicsTools/Utility.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Utility.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Utility.cs.meta diff --git a/Assets/Scripts/PhysicsTools/Winch.cs b/Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs similarity index 100% rename from Assets/Scripts/PhysicsTools/Winch.cs rename to Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs diff --git a/Assets/Scripts/PhysicsTools/Winch.cs.meta b/Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs.meta similarity index 100% rename from Assets/Scripts/PhysicsTools/Winch.cs.meta rename to Assets/Scripts/ThirdParty/PhysicsTools/Winch.cs.meta diff --git a/Assets/Scripts/Commands.meta b/Assets/Scripts/ThirdParty/Steamworks.NET.meta similarity index 77% rename from Assets/Scripts/Commands.meta rename to Assets/Scripts/ThirdParty/Steamworks.NET.meta index f2c0d0a19..e892a2aae 100644 --- a/Assets/Scripts/Commands.meta +++ b/Assets/Scripts/ThirdParty/Steamworks.NET.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1cf04fd3e4bfe814d8ec9c601994a942 +guid: 62ddefd95a62cbc4ea1a2aabc009a378 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Steamworks.NET/SteamManager.cs b/Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs similarity index 100% rename from Assets/Scripts/Steamworks.NET/SteamManager.cs rename to Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs diff --git a/Assets/Scripts/Steamworks.NET/SteamManager.cs.meta b/Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs.meta similarity index 100% rename from Assets/Scripts/Steamworks.NET/SteamManager.cs.meta rename to Assets/Scripts/ThirdParty/Steamworks.NET/SteamManager.cs.meta diff --git a/Assets/Scripts/UI/Loading/Loading.cs b/Assets/Scripts/UI/Loading/Loading.cs index 199d42514..9afa2dfb3 100644 --- a/Assets/Scripts/UI/Loading/Loading.cs +++ b/Assets/Scripts/UI/Loading/Loading.cs @@ -4,36 +4,36 @@ namespace NBF { public static class Loading { - /// - /// 显示loading - /// - /// 加载任务链 - /// 样式 - /// 开始进度 - public static void Show(NTask task = null, int style = 0, int startProgress = 0) - { - if (task != null) - { - //如果传入了任务进度 - LoadingPanel.LoadingTask.Add(task); - } - else - { - var waitTask = new LoadingWaitTask(); - waitTask.Run(DefRunner.Scheduler); - LoadingPanel.LoadingTask.Add(waitTask); - } - - var panel = App.UI.GetUI(); - if (panel is not { IsShowing: true }) - { - LoadingPanel.Show(new LoadingShowParam(style, startProgress)); - } - } - - public static void Hide() - { - LoadingPanel.LoadingTask.TryEnd(); - } + // /// + // /// 显示loading + // /// + // /// 加载任务链 + // /// 样式 + // /// 开始进度 + // public static void Show(NTask task = null, int style = 0, int startProgress = 0) + // { + // if (task != null) + // { + // //如果传入了任务进度 + // LoadingPanel.LoadingTask.Add(task); + // } + // else + // { + // var waitTask = new LoadingWaitTask(); + // waitTask.Run(DefRunner.Scheduler); + // LoadingPanel.LoadingTask.Add(waitTask); + // } + // + // var panel = App.UI.GetUI(); + // if (panel is not { IsShowing: true }) + // { + // LoadingPanel.Show(new LoadingShowParam(style, startProgress)); + // } + // } + // + // public static void Hide() + // { + // LoadingPanel.LoadingTask.TryEnd(); + // } } } \ No newline at end of file