diff --git a/.idea/.idea.perfect-world-unity/.idea/.gitignore b/.idea/.idea.perfect-world-unity/.idea/.gitignore
new file mode 100644
index 0000000000..7848fc99cd
--- /dev/null
+++ b/.idea/.idea.perfect-world-unity/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/modules.xml
+/contentModel.xml
+/.idea.perfect-world-unity.iml
+/projectSettingsUpdater.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/.idea.perfect-world-unity/.idea/vcs.xml b/.idea/.idea.perfect-world-unity/.idea/vcs.xml
new file mode 100644
index 0000000000..35eb1ddfbb
--- /dev/null
+++ b/.idea/.idea.perfect-world-unity/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/PerfectWorld/Prefab/GameController.prefab b/Assets/PerfectWorld/Prefab/GameController.prefab
index 84e1df02bc..ab17eb1e7a 100644
--- a/Assets/PerfectWorld/Prefab/GameController.prefab
+++ b/Assets/PerfectWorld/Prefab/GameController.prefab
@@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2780428059708698453}
- - component: {fileID: 4062305846887961480}
- component: {fileID: 1890210201668811196}
+ - component: {fileID: 6919949516443544071}
m_Layer: 0
m_Name: GameController
m_TagString: Untagged
@@ -33,27 +33,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4062305846887961480
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6950113420985123515}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 839d10a1a7b2c4a44a99e77558b12d02, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- characterPrefab: {fileID: 6513559496054861882, guid: 1f80fef119a826b4a826baf52a8f92d7, type: 3}
- monsterPrefab: {fileID: 2542060226037108388, guid: 244942d3fb9382846b82581ce24fbf4e, type: 3}
- npcServerPrefab: {fileID: -5899287755522118344, guid: 9bd42cdc18b3d624db35707155fc50de, type: 3}
- cinemachineCamera: {fileID: 0}
- _testVfxPrefab: {fileID: 2282869967233380084, guid: 88e840e5dac12ed4383d994c7fadfef1, type: 3}
- SelectingVfxPrefab: {fileID: 6894650530511576330, guid: 412301bece3ebe640b2da0e18c5f4028, type: 3}
- freeLookCam: {fileID: 0}
- rotateSpeedX: 300
- rotateSpeedY: 2
--- !u!114 &1890210201668811196
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -70,3 +49,23 @@ MonoBehaviour:
uiPrefabs: []
npsUI: {fileID: 0}
currentTargetNPCID: 0
+--- !u!114 &6919949516443544071
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6950113420985123515}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5de219a5b9756ae4ebf01e2919b92cde, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ characterPrefab: {fileID: 6513559496054861882, guid: 1f80fef119a826b4a826baf52a8f92d7, type: 3}
+ monsterPrefab: {fileID: 2542060226037108388, guid: 244942d3fb9382846b82581ce24fbf4e, type: 3}
+ npcServerPrefab: {fileID: -5899287755522118344, guid: 9bd42cdc18b3d624db35707155fc50de, type: 3}
+ cinemachineCamera: {fileID: 0}
+ _testVfxPrefab: {fileID: 0}
+ freeLookCam: {fileID: 0}
+ rotateSpeedX: 300
+ rotateSpeedY: 2
diff --git a/Assets/PerfectWorld/Scripts/Common/AutoInitializer.cs b/Assets/PerfectWorld/Scripts/Common/AutoInitializer.cs
index 948e25d22c..82dd10aa56 100644
--- a/Assets/PerfectWorld/Scripts/Common/AutoInitializer.cs
+++ b/Assets/PerfectWorld/Scripts/Common/AutoInitializer.cs
@@ -12,6 +12,7 @@ namespace BrewMonster
private void Awake()
{
Initialize();
+ SkillStubs.Init();
DontDestroyOnLoad(gameObject);
}
diff --git a/Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs b/Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs
index af29d073f1..9f5690121a 100644
--- a/Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs
+++ b/Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs
@@ -600,13 +600,11 @@ namespace ModelRenderer.Scripts.GameData
add_id_index(ID_SPACE.ID_SPACE_ESSENCE, item.id, DATA_TYPE.DT_WEAPON_SUB_TYPE);
add_id_data(ID_SPACE.ID_SPACE_ESSENCE, item.id, item);
}
-
foreach (var item in npc_essence_array)
{
add_id_index(ID_SPACE.ID_SPACE_ESSENCE, item.id, DATA_TYPE.DT_NPC_ESSENCE);
add_id_data(ID_SPACE.ID_SPACE_ESSENCE, item.id, item);
}
-
foreach (var item in weapon_essence_array)
{
add_id_index(ID_SPACE.ID_SPACE_ESSENCE, item.id, DATA_TYPE.DT_WEAPON_ESSENCE);
@@ -1519,7 +1517,16 @@ namespace ModelRenderer.Scripts.GameData
return 0;
}
-
+ public T GetDataTypeMap(ID_SPACE type) where T : class
+ {
+ object result = type switch
+ {
+ ID_SPACE.ID_SPACE_ESSENCE => essence_id_data_type_map,
+ _ => null
+ };
+
+ return result as T;
+ }
void add_id_data(ID_SPACE idSpace, uint id, object data)
{
@@ -1641,7 +1648,42 @@ namespace ModelRenderer.Scripts.GameData
}
return DATA_TYPE.DT_INVALID;
}
+ public object[] GetAllDataTypeWithType(ID_SPACE idspace,DATA_TYPE dataType )
+ {
+ List