简单提交

2025-09-26 18:26:23 +00:00 · 2024-10-18 15:29:52 +08:00
parent d9b0c78827
commit 8cea537319
57 changed files with 21430 additions and 21867 deletions
--- a/JEX_GAS/Assets/Demo/Editor.meta
+++ b/JEX_GAS/Assets/Demo/Editor.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 53be96c533934ee7b486379f6f45bafa
+timeCreated: 1729222529
--- a/JEX_GAS/Assets/Demo/Editor/GAS.meta
+++ b/JEX_GAS/Assets/Demo/Editor/GAS.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fbf21400b3864f29b6c0abab26b025f0
+timeCreated: 1729222533
--- a/JEX_GAS/Assets/Demo/Editor/GAS/Ability.meta
+++ b/JEX_GAS/Assets/Demo/Editor/GAS/Ability.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e8455bd06c174f28abd859715d4d4504
+timeCreated: 1729222551
--- a/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector.meta
+++ b/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 28929d3e41dc4dc4ace45485eb45849f
+timeCreated: 1729222562
--- a/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector/OngoingAbility.meta
+++ b/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector/OngoingAbility.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ac9ad0beca774e71beb0bb45da860226
+timeCreated: 1729222612
--- a/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector/OngoingAbility/OngoingAbility_Debug_Inspector.cs
+++ b/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector/OngoingAbility/OngoingAbility_Debug_Inspector.cs
@@ -0,0 +1,43 @@
+using Demo.Scripts.GAS.OngoingAbilityTasks;
+using GAS.Editor;
+using GAS.Runtime;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+namespace Demo.Editor.GAS.Ability.TaskInspector.OngoingAbility
+{
+    public class OngoingAbility_Debug_Inspector : OngoingTaskInspector<OngoingAbility_Debug>
+    {
+        
+        [Delayed, LabelText("开始位置"), OnValueChanged("OnStartChanged")]
+        public Vector3 start;
+        [Delayed, LabelText("结束位置"), OnValueChanged("OnEndChanged")]
+        public Vector3 end;
+        
+        public override void Init(OngoingAbilityTask task)
+        {
+            base.Init(task);
+            start = _task.start;
+            start = _task.end;
+        }
+
+        /// <summary>
+        /// 触发概率配置变更监听
+        /// </summary>
+        private void OnStartChanged()
+        {
+            _task.start = start;
+            Save();
+        }
+
+        /// <summary>
+        /// 技能配置ID变更监听
+        /// </summary>
+        private void OnEndChanged()
+        {
+            _task.end = end;
+            Save();
+        }
+        
+    }
+}
--- a/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector/OngoingAbility/OngoingAbility_Debug_Inspector.cs.meta
+++ b/JEX_GAS/Assets/Demo/Editor/GAS/Ability/TaskInspector/OngoingAbility/OngoingAbility_Debug_Inspector.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 73bc2380baef40fa9340b5518186bb8c
+timeCreated: 1729222616
--- a/JEX_GAS/Assets/Demo/GAS/Config/AbilitySystemComponentLib/ASC_Player.asset
+++ b/JEX_GAS/Assets/Demo/GAS/Config/AbilitySystemComponentLib/ASC_Player.asset
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85dd2a6201f04545b5a8b020edcb2690, type: 3}
+  m_Name: ASC_Player
+  m_EditorClassIdentifier: 
+  Description: 
+  AttributeSets: []
+  BaseTags: []
+  BaseAbilities:
+  - {fileID: 11400000, guid: b78ae002fbbf510419a39987f22201f1, type: 2}
--- a/JEX_GAS/Assets/Demo/GAS/Config/AbilitySystemComponentLib/ASC_Player.asset.meta
+++ b/JEX_GAS/Assets/Demo/GAS/Config/AbilitySystemComponentLib/ASC_Player.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7692a8d07949a5c46b6b5325ebb9a422
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/JEX_GAS/Assets/Demo/GAS/Config/GameplayAbilityLib/JisolDemo1.asset
+++ b/JEX_GAS/Assets/Demo/GAS/Config/GameplayAbilityLib/JisolDemo1.asset
@@ -24,27 +24,38 @@ MonoBehaviour:
  ActivationRequiredTags: []
  ActivationBlockedTags: []
  Speed: 1
-  ManualEndAbility: 1
+  ManualEndAbility: 0
  FrameCount: 60
  DurationalCues:
-  - trackName: 
-    clipEvents: []
+  - trackName: "\u6301\u7EEDGameplayCue\u8F68\u9053"
+    clipEvents:
+    - startFrame: 6
+      durationFrame: 34
+      cue: {fileID: 11400000, guid: 0a77e9c8e20008944a99814e0b5a4aed, type: 2}
  InstantCues:
-  - trackName: 
+  - trackName: "\u5373\u65F6Cue\u8F68\u9053"
    markEvents: []
  ReleaseGameplayEffect:
-  - trackName: 
+  - trackName: "GameplayEffect\u91CA\u653E\u8F68\u9053"
    markEvents: []
  BuffGameplayEffects:
  - trackName: Buff
    clipEvents: []
  InstantTasks:
-  - trackName: 
+  - trackName: "\u5373\u65F6Task\u8F68\u9053"
    markEvents: []
  OngoingTasks:
  - trackName: Task Clips
+    clipEvents:
+    - startFrame: 27
+      durationFrame: 20
+      ongoingTask:
+        TaskData:
+          Type: Demo.Scripts.GAS.OngoingAbilityTasks.OngoingAbility_Debug
+          Data: '{"start":{"x":0.0,"y":0.0,"z":0.0},"end":{"x":100.0,"y":0.0,"z":0.0}}'
+  PassiveGameplayEffects:
+  - trackName: Passive
    clipEvents: []
-  - trackName: Task Clips
+  PassiveTasks:
+  - trackName: Passive Task
    clipEvents: []
-  PassiveGameplayEffects: []
-  PassiveTasks: []
--- a/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCueDurational_PlayerDemo.asset
+++ b/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCueDurational_PlayerDemo.asset
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 321af3379125465380073b2a04a1b1e2, type: 3}
+  m_Name: GCueDurational_PlayerDemo
+  m_EditorClassIdentifier: 
+  Description: 
+  RequiredTags: []
+  ImmunityTags: []
+  start: {x: 0, y: 0, z: 0}
+  end: {x: 10, y: 0, z: 0}
--- a/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCueDurational_PlayerDemo.asset.meta
+++ b/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCueDurational_PlayerDemo.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0a77e9c8e20008944a99814e0b5a4aed
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCue_PlayerDemo.asset
+++ b/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCue_PlayerDemo.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ec56ec3ecd444759979c63b23ecf0c39, type: 3}
+  m_Name: GCue_PlayerDemo
+  m_EditorClassIdentifier: 
+  Description: 
+  RequiredTags: []
+  ImmunityTags: []
--- a/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCue_PlayerDemo.asset.meta
+++ b/JEX_GAS/Assets/Demo/GAS/Config/GameplayCueLib/GCue_PlayerDemo.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 041f193225d7b1e49a75af0003a4111b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/JEX_GAS/Assets/Demo/Scripts/GAS.meta
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 93d542b5cd7d40219abcee66ef046f93
+timeCreated: 1729220421
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue.meta
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 70bc0ba32472468e8765e4c1f7acbcdf
+timeCreated: 1729224096
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCueDurational_PlayerDemo01.cs
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCueDurational_PlayerDemo01.cs
@@ -0,0 +1,65 @@
+using GAS.General;
+using GAS.Runtime;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+namespace Demo.Scripts.GAS.GameplayCue
+{
+    public class GameplayCueDurational_PlayerDemo01 : GameplayCueDurational
+    {
+        
+        [BoxGroup]
+        [LabelText("开始位置")]
+        public Vector3 start;
+        [BoxGroup]
+        [LabelText("结束位置")]
+        public Vector3 end;
+        
+        public override GameplayCueDurationalSpec CreateSpec(GameplayCueParameters parameters)
+        {
+            return new GameplayCueDurational_PlayerDemo01_Spec(this,parameters);
+        }
+        
+#if UNITY_EDITOR
+        public override void OnEditorPreview(GameObject previewObject, int frameIndex, int startFrame, int endFrame)
+        {
+            Debug.Log($"GameplayCue_PlayerDemo01 {previewObject} {frameIndex}");
+
+            if (frameIndex >= startFrame && frameIndex <= endFrame)
+            {
+                previewObject.transform.position = Vector3.Lerp(start, end, (float)(frameIndex - startFrame) / endFrame);
+            }
+            
+        }
+#endif
+        
+    }
+
+    public class GameplayCueDurational_PlayerDemo01_Spec : GameplayCueDurationalSpec<GameplayCueDurational_PlayerDemo01>
+    {
+        public GameplayCueDurational_PlayerDemo01_Spec(GameplayCueDurational_PlayerDemo01 cue, GameplayCueParameters parameters) : base(cue, parameters)
+        {
+        }
+
+        public override void OnAdd()
+        {
+        }
+
+        public override void OnRemove()
+        {
+        }
+
+        public override void OnGameplayEffectActivate()
+        {
+        }
+
+        public override void OnGameplayEffectDeactivate()
+        {
+        }
+
+        public override void OnTick()
+        {
+        }
+    }
+    
+}
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCueDurational_PlayerDemo01.cs.meta
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCueDurational_PlayerDemo01.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 321af3379125465380073b2a04a1b1e2
+timeCreated: 1729234472
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCue_PlayerDemo01.cs
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCue_PlayerDemo01.cs
@@ -0,0 +1,35 @@
+using GAS.Runtime;
+using UnityEngine;
+
+namespace Demo.Scripts.GAS.GameplayCue
+{
+    public class GameplayCue_PlayerDemo01 : GameplayCueInstant
+    {
+        public override GameplayCueInstantSpec CreateSpec(GameplayCueParameters parameters)
+        {
+            return new GameplayCue_PlayerDemo01_Spec(this,parameters);
+        }
+        
+#if UNITY_EDITOR
+        public override void OnEditorPreview(GameObject previewObject, int frame, int startFrame)
+        {
+            Debug.Log($"GameplayCue_PlayerDemo01 {previewObject}");
+        }
+#endif
+        
+    }
+
+    public class GameplayCue_PlayerDemo01_Spec : GameplayCueInstantSpec
+    {
+        
+        public GameplayCue_PlayerDemo01_Spec(GameplayCueInstant cue, GameplayCueParameters parameters) : base(cue, parameters)
+        {
+        }
+
+        public override void Trigger()
+        {
+        }
+        
+    }
+    
+}
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCue_PlayerDemo01.cs.meta
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/GameplayCue/GameplayCue_PlayerDemo01.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ec56ec3ecd444759979c63b23ecf0c39
+timeCreated: 1729233357
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/OngoingAbilityTasks.meta
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/OngoingAbilityTasks.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 364e48fdbe4b487f8a05c7b78291559c
+timeCreated: 1729220475
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/OngoingAbilityTasks/OngoingAbility_Debug.cs
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/OngoingAbilityTasks/OngoingAbility_Debug.cs
@@ -0,0 +1,42 @@
+using GAS.Runtime;
+using UnityEngine;
+
+namespace Demo.Scripts.GAS.OngoingAbilityTasks
+{
+    public class OngoingAbility_Debug : OngoingAbilityTask
+    {
+
+        public Vector3 start;
+        public Vector3 end;
+        
+#if UNITY_EDITOR
+        /// <summary>
+        /// 编辑器预览用
+        /// 【注意】 覆写时，记得用UNITY_EDITOR宏包裹，这是预览表现用的函数，不该被编译。
+        /// </summary>
+        /// <param name="frame"></param>
+        /// <param name="startFrame"></param>
+        /// <param name="endFrame"></param>
+        public override void OnEditorPreview(int frame, int startFrame, int endFrame)
+        {
+            Debug.Log($"OnEditorPreview {Vector3.Lerp(start,end,(float)frame / (float)endFrame)}");
+            // _spec.Owner.gameObject.transform.position = Vector3.Lerp(start, end, (float)startFrame / endFrame);
+        }
+#endif
+        
+        public override void OnStart(int startFrame)
+        {
+            Debug.Log("OnEnd");
+        }
+
+        public override void OnEnd(int endFrame)
+        {
+            Debug.Log("OnEnd");
+        }
+
+        public override void OnTick(int frameIndex, int startFrame, int endFrame)
+        {
+            Debug.Log("OnTick");
+        }
+    }
+}
--- a/JEX_GAS/Assets/Demo/Scripts/GAS/OngoingAbilityTasks/OngoingAbility_Debug.cs.meta
+++ b/JEX_GAS/Assets/Demo/Scripts/GAS/OngoingAbilityTasks/OngoingAbility_Debug.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8f6034c656814b79b9be57cd41b35d9a
+timeCreated: 1729220520
--- a/JEX_GAS/Assets/Main.unity
+++ b/JEX_GAS/Assets/Main.unity
@@ -209,13 +209,13 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 28019073}
-  serializedVersion: 2
  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
  m_LocalPosition: {x: 0, y: 3, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &857251289
 GameObject:
@@ -229,6 +229,7 @@ GameObject:
  - component: {fileID: 857251292}
  - component: {fileID: 857251291}
  - component: {fileID: 857251290}
+  - component: {fileID: 857251294}
  m_Layer: 0
  m_Name: Cube
  m_TagString: Untagged
@@ -314,14 +315,27 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 857251289}
-  serializedVersion: 2
  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: 0}
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &857251294
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 857251289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 183fdb9275244e99bf882bd2e9cb85d5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  preset: {fileID: 11400000, guid: 7692a8d07949a5c46b6b5325ebb9a422, type: 2}
 --- !u!1 &2104190881
 GameObject:
  m_ObjectHideFlags: 0
@@ -406,18 +420,11 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2104190881}
-  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 1, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1660057539 &9223372036854775807
-SceneRoots:
-  m_ObjectHideFlags: 0
-  m_Roots:
-  - {fileID: 2104190884}
-  - {fileID: 28019075}
-  - {fileID: 857251293}
--- a/JEX_GAS/Packages/manifest.json
+++ b/JEX_GAS/Packages/manifest.json
@@ -3,7 +3,6 @@
    "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
    "com.exhard.exmaidforui": "https://github.com/No78Vino/EXMaidForFGUIandLoxondon.git",
    "com.unity.collab-proxy": "2.2.0",
-    "com.unity.feature.2d": "2.0.0",
    "com.unity.feature.development": "1.0.1",
    "com.unity.ide.rider": "3.0.27",
    "com.unity.inputsystem": "1.7.0",
--- a/JEX_GAS/Packages/packages-lock.json
+++ b/JEX_GAS/Packages/packages-lock.json
@@ -14,167 +14,39 @@
      "dependencies": {},
      "hash": "b469ae66a33df51d1f5a9aa01f2213ea5826400f"
    },
-    "com.unity.2d.animation": {
-      "version": "9.0.4",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.common": "8.0.1",
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.collections": "1.1.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.uielements": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.2d.aseprite": {
-      "version": "1.0.1",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.2d.common": "6.0.6",
-        "com.unity.mathematics": "1.2.6",
-        "com.unity.modules.animation": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.2d.common": {
-      "version": "8.0.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.mathematics": "1.1.0",
-        "com.unity.modules.uielements": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.burst": "1.7.3"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.2d.pixel-perfect": {
-      "version": "5.0.3",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.2d.psdimporter": {
-      "version": "8.0.3",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.animation": "9.0.4",
-        "com.unity.2d.common": "8.0.2",
-        "com.unity.2d.sprite": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.2d.sprite": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.2d.spriteshape": {
-      "version": "9.0.2",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.mathematics": "1.1.0",
-        "com.unity.2d.common": "8.0.1",
-        "com.unity.modules.physics2d": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.2d.tilemap": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.tilemap": "1.0.0",
-        "com.unity.modules.uielements": "1.0.0"
-      }
-    },
-    "com.unity.2d.tilemap.extras": {
-      "version": "3.1.2",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.tilemap": "1.0.0",
-        "com.unity.2d.tilemap": "1.0.0",
-        "com.unity.ugui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.burst": {
-      "version": "1.8.11",
-      "depth": 3,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.mathematics": "1.2.1"
-      },
-      "url": "https://packages.unity.cn"
-    },
    "com.unity.collab-proxy": {
      "version": "2.2.0",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.collections": {
-      "version": "1.2.4",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.burst": "1.6.6",
-        "com.unity.test-framework": "1.1.31"
-      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.editorcoroutines": {
      "version": "1.0.0",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.ext.nunit": {
      "version": "1.0.6",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.feature.2d": {
-      "version": "2.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.2d.animation": "9.0.4",
-        "com.unity.2d.pixel-perfect": "5.0.3",
-        "com.unity.2d.psdimporter": "8.0.3",
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.2d.spriteshape": "9.0.2",
-        "com.unity.2d.tilemap": "1.0.0",
-        "com.unity.2d.tilemap.extras": "3.1.2",
-        "com.unity.2d.aseprite": "1.0.1"
-      }
+      "url": "https://packages.unity.com"
    },
    "com.unity.feature.development": {
      "version": "1.0.1",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.22",
-        "com.unity.ide.rider": "3.0.27",
+        "com.unity.ide.visualstudio": "2.0.18",
+        "com.unity.ide.rider": "3.0.21",
        "com.unity.ide.vscode": "1.2.5",
        "com.unity.editorcoroutines": "1.0.0",
        "com.unity.performance.profile-analyzer": "1.2.2",
        "com.unity.test-framework": "1.1.33",
-        "com.unity.testtools.codecoverage": "1.2.4"
+        "com.unity.testtools.codecoverage": "1.2.3"
      }
    },
    "com.unity.ide.rider": {
@@ -184,23 +56,23 @@
      "dependencies": {
        "com.unity.ext.nunit": "1.0.6"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.ide.visualstudio": {
-      "version": "2.0.22",
+      "version": "2.0.18",
      "depth": 1,
      "source": "registry",
      "dependencies": {
        "com.unity.test-framework": "1.1.9"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.ide.vscode": {
      "version": "1.2.5",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
      "version": "1.7.0",
@@ -209,28 +81,28 @@
      "dependencies": {
        "com.unity.modules.uielements": "1.0.0"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.mathematics": {
      "version": "1.2.6",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.performance.profile-analyzer": {
      "version": "1.2.2",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.settings-manager": {
      "version": "2.0.1",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.test-framework": {
      "version": "1.1.33",
@@ -241,17 +113,17 @@
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.testtools.codecoverage": {
-      "version": "1.2.4",
+      "version": "1.2.3",
      "depth": 1,
      "source": "registry",
      "dependencies": {
        "com.unity.test-framework": "1.0.16",
        "com.unity.settings-manager": "1.0.1"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.textmeshpro": {
      "version": "3.0.6",
@@ -260,19 +132,19 @@
      "dependencies": {
        "com.unity.ugui": "1.0.0"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.timeline": {
      "version": "1.7.6",
      "depth": 0,
      "source": "registry",
      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
        "com.unity.modules.director": "1.0.0",
        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
        "com.unity.modules.particlesystem": "1.0.0"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.unity.ugui": {
      "version": "1.0.0",
@@ -291,7 +163,7 @@
        "com.unity.ugui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
    },
    "com.vovgou.loxodon-framework": {
      "version": "https://github.com/vovgou/loxodon-framework.git?path=Loxodon.Framework/Assets/LoxodonFramework",
--- a/JEX_GAS/ProjectSettings/PackageManagerSettings.asset
+++ b/JEX_GAS/ProjectSettings/PackageManagerSettings.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
  m_Registries:
  - m_Id: main
    m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.unity.com
    m_Scopes: []
    m_IsDefault: 1
    m_Capabilities: 7
@@ -39,6 +39,6 @@ MonoBehaviour:
  m_RegistryInfoDraft:
    m_Modified: 0
    m_ErrorMessage: 
-    m_UserModificationsInstanceId: -838
-    m_OriginalInstanceId: -842
+    m_UserModificationsInstanceId: -856
+    m_OriginalInstanceId: -860
  m_LoadAssets: 0
--- a/JEX_GAS/ProjectSettings/ProjectVersion.txt
+++ b/JEX_GAS/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.16f1c1
-m_EditorVersionWithRevision: 2022.3.16f1c1 (2f3f1b3bde89)
+m_EditorVersion: 2022.3.1f1
+m_EditorVersionWithRevision: 2022.3.1f1 (f18e0c1b5784)