diff --git a/AssetBundles/version_banshu.txt b/AssetBundles/version_banshu.txt
new file mode 100644
index 0000000000..9248d0d93f
--- /dev/null
+++ b/AssetBundles/version_banshu.txt
@@ -0,0 +1 @@
+{"subChannel":"888", "buglyId":"b67b061643", "channel":"pc", "resUrl":"http://cdn-jl.lanjingshidai.com/banshu/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://154.8.225.157:8080/"}
\ No newline at end of file
diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_dhdj01.mp3 b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_dhdj01.mp3
index bdd43e5de9..8b1d2512e8 100644
Binary files a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_dhdj01.mp3 and b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_dhdj01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_ddtz_00049_001_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_ddtz_00049_001_01.mp3
new file mode 100644
index 0000000000..9ddecb4577
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_ddtz_00049_001_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_ddtz_00049_001_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_ddtz_00049_001_01.mp3.meta
new file mode 100644
index 0000000000..41d57a08e1
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_ddtz_00049_001_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 44e8f8c35f8874042a8856c45b185457
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3
new file mode 100644
index 0000000000..f6b4aad8ef
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3.meta
new file mode 100644
index 0000000000..5c37f59f1e
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b7ebc3f2d874cc34aaaafeb362b0a36c
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_01.mp3
new file mode 100644
index 0000000000..c59ef6de56
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_01.mp3.meta
new file mode 100644
index 0000000000..356f73deb5
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a0c8cd122c8e7be48be5d7d9984eaa7d
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_02.mp3
new file mode 100644
index 0000000000..4041a848c1
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_02.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_02.mp3.meta
new file mode 100644
index 0000000000..cfb5808100
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_lc_00050_001_02.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 896a3366a6ab7d140850d34bf1860504
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_01.mp3
new file mode 100644
index 0000000000..3b31c07d37
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_01.mp3.meta
new file mode 100644
index 0000000000..8d729ad3f2
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3fd7c7e0c43026441be04fc350c66a78
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_02.mp3
new file mode 100644
index 0000000000..647170e7dd
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_02.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_02.mp3.meta
new file mode 100644
index 0000000000..f949719aab
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_mp_00051_001_02.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 9cebf67f0c4a28a4787608131d222ab2
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_yc_00052_001_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_yc_00052_001_02.mp3
new file mode 100644
index 0000000000..4bfa89a807
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_yc_00052_001_02.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_yc_00052_001_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_yc_00052_001_02.mp3.meta
new file mode 100644
index 0000000000..2d8c66a792
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_yc_00052_001_02.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5b5220f537cf91e48a16941aceaed623
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_01.mp3
new file mode 100644
index 0000000000..70a453ec62
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_01.mp3.meta
new file mode 100644
index 0000000000..7d33d6cc64
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 636d05a406b746245a9fa5f9147d5278
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3
new file mode 100644
index 0000000000..fbb58acab7
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3.meta
new file mode 100644
index 0000000000..44c24672b1
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: ab41ca36aabc65345889a7d0eff8a307
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3
new file mode 100644
index 0000000000..9fc76803ac
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3.meta
new file mode 100644
index 0000000000..9acb562683
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e99cdf5a04f73534ca7336398d081ff3
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3
new file mode 100644
index 0000000000..75ab7733ae
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3.meta
new file mode 100644
index 0000000000..398f575d1a
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3da90062ec95f644881f7a44b98b3614
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack.mp3
new file mode 100644
index 0000000000..fdcd453ddb
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack.mp3.meta
new file mode 100644
index 0000000000..c08c3b11bf
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 01112efd396993249b8f1a1261cee635
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_t3_attack.mp3
new file mode 100644
index 0000000000..b4b129d925
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_t3_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_t3_attack.mp3.meta
new file mode 100644
index 0000000000..827bdf6529
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_t3_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 565d3e0d570afc541b95e45b361e848f
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3
new file mode 100644
index 0000000000..31eb869828
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3.meta
new file mode 100644
index 0000000000..31b8742a88
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 69e1577286ecb1f4b8088832ad29711a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yanwang_jineng.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yanwang_jineng.mp3
new file mode 100644
index 0000000000..ded5b0de83
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yanwang_jineng.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yanwang_jineng.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yanwang_jineng.mp3.meta
new file mode 100644
index 0000000000..1c48d968d9
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yanwang_jineng.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 54bed607bff1ae945874063f1ef4501c
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3
new file mode 100644
index 0000000000..9868f0c99f
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3.meta
new file mode 100644
index 0000000000..50683b1203
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5af22994c413fb649825e42fceb23311
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3
new file mode 100644
index 0000000000..9fd8df7abb
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta
new file mode 100644
index 0000000000..d7b64adf0a
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5947448ed78aa8a4891768f2caba1103
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3
index 47a0af5ca8..74637ae8de 100644
Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3
index 0df894e638..ca310abece 100644
Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3
index 77403b60da..0a901c420b 100644
Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3
index 8799ad5a4b..644a93db31 100644
Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3
index 6977af530d..d0d4193edb 100644
Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3
index 38d3402b65..935f385761 100644
Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3
new file mode 100644
index 0000000000..cf34f30083
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3.meta
new file mode 100644
index 0000000000..9f885aaf47
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 4cf83db9ed2392c439bf3e0148e4ae4a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3
new file mode 100644
index 0000000000..cde826dd15
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3.meta
new file mode 100644
index 0000000000..a39e11dba8
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f10905534db65734a89866168c515422
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3
new file mode 100644
index 0000000000..1c9242f7ce
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3.meta
new file mode 100644
index 0000000000..6be7b84e0c
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 06cf871f360d88c4b8265017aa0b6fa8
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3
new file mode 100644
index 0000000000..9995b2a06a
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3.meta
new file mode 100644
index 0000000000..b80269d94b
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 16e0b4d0c58355646b90ebea5b4f8048
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3
new file mode 100644
index 0000000000..cd4a55c158
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3.meta
new file mode 100644
index 0000000000..1bdad7cde7
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 69ca8068657e03b4488e2140326cf111
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3
new file mode 100644
index 0000000000..cf71c78b81
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3.meta
new file mode 100644
index 0000000000..9fccdf90a3
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1a7975732ad5b4e4198ecf769beb7581
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3
new file mode 100644
index 0000000000..997c70d0ac
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3.meta
new file mode 100644
index 0000000000..ab9b31ab79
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 166ac18d0dbbb5d47936405c830dcf5d
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3
new file mode 100644
index 0000000000..a49b5fda0d
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3.meta
new file mode 100644
index 0000000000..008891ff65
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b774de5e5b72bbb4591cd554c4e1960d
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3
new file mode 100644
index 0000000000..1fec7fb87c
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3.meta
new file mode 100644
index 0000000000..9f3f3d9516
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1fa00212c37df734f98de45594eb6397
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3
new file mode 100644
index 0000000000..0c653bf8b7
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3.meta
new file mode 100644
index 0000000000..82ec6956ac
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8f3bb5e2a191e864fb7971b8432d1a42
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3
index d4f797ed25..077117555a 100644
Binary files a/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3
index 636f80bdb1..47659d6348 100644
Binary files a/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3 differ
diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
index ae12ed0440..618aec74f0 100644
--- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
@@ -8950,7 +8950,7 @@ ParticleSystem:
--- !u!199 &3612650515471756776
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -9009,6 +9009,80 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
+--- !u!1 &505770842250798135
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3658820307080558578}
+ - component: {fileID: 4467434971352855995}
+ - component: {fileID: 6559493155396458225}
+ m_Layer: 5
+ m_Name: bg
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3658820307080558578
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 505770842250798135}
+ 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_Children: []
+ m_Father: {fileID: 5920091256592146076}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 200, y: 200}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4467434971352855995
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 505770842250798135}
+ m_CullTransparentMesh: 0
+--- !u!114 &6559493155396458225
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 505770842250798135}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: ce6a5e8caebae894bbb7d3eeb17e8dcb, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &514895659153598263
GameObject:
m_ObjectHideFlags: 0
@@ -10028,6 +10102,146 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &953603666181120984
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5920091256592146076}
+ - component: {fileID: 1256521596463652073}
+ - component: {fileID: 33425264411396213}
+ - component: {fileID: 4818623307793287480}
+ - component: {fileID: 8155948301886312948}
+ m_Layer: 5
+ m_Name: btnEndLess
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5920091256592146076
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953603666181120984}
+ 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_Children:
+ - {fileID: 3658820307080558578}
+ - {fileID: 5439542028704354727}
+ - {fileID: 3535028079000984113}
+ m_Father: {fileID: 5352445832565045888}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 98, y: 58}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1256521596463652073
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953603666181120984}
+ m_CullTransparentMesh: 0
+--- !u!114 &33425264411396213
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953603666181120984}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 3
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 4818623307793287480}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!114 &4818623307793287480
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953603666181120984}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: ce6a5e8caebae894bbb7d3eeb17e8dcb, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!95 &8155948301886312948
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953603666181120984}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &965127853240215727
GameObject:
m_ObjectHideFlags: 0
@@ -15668,7 +15882,7 @@ ParticleSystem:
--- !u!199 &2077135144819501974
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -21157,7 +21371,7 @@ ParticleSystem:
--- !u!199 &5382233283546536858
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -29184,7 +29398,7 @@ ParticleSystem:
--- !u!199 &7853653569377049714
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -29956,6 +30170,81 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &3143014610662857415
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5439542028704354727}
+ - component: {fileID: 7144515067775352344}
+ - component: {fileID: 8171384327707400034}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5439542028704354727
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3143014610662857415}
+ 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_Children:
+ - {fileID: 3562039041186135146}
+ m_Father: {fileID: 5920091256592146076}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 176, y: 176}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7144515067775352344
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3143014610662857415}
+ m_CullTransparentMesh: 0
+--- !u!114 &8171384327707400034
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3143014610662857415}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 5a8901c400a952045b296654b26852ab, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &3150642506789933119
GameObject:
m_ObjectHideFlags: 0
@@ -35085,7 +35374,7 @@ ParticleSystem:
--- !u!199 &4678487443364567018
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -40626,7 +40915,7 @@ ParticleSystem:
--- !u!199 &3301434479282110283
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -46667,7 +46956,7 @@ ParticleSystem:
--- !u!199 &8426323061574149814
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -51886,7 +52175,7 @@ ParticleSystem:
--- !u!199 &3988090302360095373
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -57469,7 +57758,7 @@ ParticleSystem:
--- !u!199 &5461926455895321923
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -62593,7 +62882,7 @@ ParticleSystem:
--- !u!199 &6960492284779320589
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -63176,6 +63465,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &4617127911449407355
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3562039041186135146}
+ - component: {fileID: 8582731860418925768}
+ - component: {fileID: 1740424978376335241}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3562039041186135146
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4617127911449407355}
+ 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_Children: []
+ m_Father: {fileID: 5439542028704354727}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -2.6, y: -49.5}
+ m_SizeDelta: {x: 117.76, y: 65.64}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8582731860418925768
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4617127911449407355}
+ m_CullTransparentMesh: 0
+--- !u!114 &1740424978376335241
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4617127911449407355}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.972549, g: 0.92156863, b: 0.6039216, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 34
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u65E0\u5C3D"
+ LanguageIndex: 11043
--- !u!1 &4620582756844543782
GameObject:
m_ObjectHideFlags: 0
@@ -68908,7 +69277,7 @@ ParticleSystem:
--- !u!199 &4261467272199160834
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -69433,6 +69802,7 @@ RectTransform:
- {fileID: 112967303376310105}
- {fileID: 2596259553296166895}
- {fileID: 348893781}
+ - {fileID: 5920091256592146076}
m_Father: {fileID: 8831099743542526053}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -73373,6 +73743,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6524790213277019500
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3535028079000984113}
+ - component: {fileID: 5215176420683823679}
+ - component: {fileID: 979575301393090075}
+ m_Layer: 5
+ m_Name: redPoint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &3535028079000984113
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6524790213277019500}
+ 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_Children: []
+ m_Father: {fileID: 5920091256592146076}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 35.4, y: 23.6}
+ m_SizeDelta: {x: 26, y: 26}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5215176420683823679
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6524790213277019500}
+ m_CullTransparentMesh: 0
+--- !u!114 &979575301393090075
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6524790213277019500}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &6543628982998522749
GameObject:
m_ObjectHideFlags: 0
@@ -78347,7 +78791,7 @@ ParticleSystem:
--- !u!199 &6383407699291000078
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -84415,7 +84859,7 @@ ParticleSystem:
--- !u!199 &1706209193022837301
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -91062,7 +91506,7 @@ ParticleSystem:
--- !u!199 &8234207848460451360
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -95974,7 +96418,7 @@ ParticleSystem:
--- !u!199 &3615746855071839570
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
index 6f49a515ba..50fd287f93 100644
--- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
+++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
@@ -102,6 +102,7 @@ GameEvent = {
-- 刷新英雄血量
RefreshHeroHp="Map.RefreshHeroHp",
StopWalk="Map.StopWalk",
+ MaskState = "Map.MaskState"
},
Event = {
PointTrigger = "Event.PointTrigger",
diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
index 4fca6984a3..0609b9c2dc 100644
--- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
@@ -10,6 +10,7 @@ this.mapShotTimeItemData = {}
this.tianFuMaterial = {}
this.needEndingTime = 0
+this.dropIsSHowEquipPrint = true--显示掉落时是否显示装备和魂印
function this.Initialize()
this.isBagPanel = false
end
@@ -703,7 +704,12 @@ function this.GetItemListFromTempBag(drop, isSave)
itemdata.frame = GetQuantityImageByquality(itemdata.configData.Quantity)
itemdata.icon = GetResourcePath(itemdata.configData.ResourceID)
itemdata.num = drop.itemlist[i].itemNum
- table.insert(itemDataList, itemdata)
+ -- LogGreen("itemdata.configData.ItemType "..itemdata.configData.ItemType.." this.dropIsSHowEquipPrint "..tostring(this.dropIsSHowEquipPrint))
+ if itemdata.configData.ItemType ~= ItemType.Equip or itemdata.configData.ItemType ~= ItemType.HunYin then
+ table.insert(itemDataList, itemdata)
+ elseif this.dropIsSHowEquipPrint then--献祭 升星吞卡 掉落身上装备和魂印 但是不显示 前端做处理
+ table.insert(itemDataList, itemdata)
+ end
end
end
if drop.equipId ~= nil and #drop.equipId > 0 then
@@ -992,4 +998,8 @@ function this.BagIndicationRefresh(msg)
CheckRedPointStatus(RedPointType.Bag_HeroDebris)
CheckRedPointStatus(RedPointType.Bag_BoxAndBlueprint)
end
+
+function this.SetDropIsSHowEquipPrint(dropIsSHowEquipPrint)
+ this.dropIsSHowEquipPrint = dropIsSHowEquipPrint
+end
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
index df6ecda0b3..1b95a9bef0 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
@@ -2206,7 +2206,7 @@ local passivityList = {
-- 释放技能后
local onSkillEnd = function(skill)
if skill.type == BattleSkillType.Special then
- local list = RoleManager.Query(function(v) return v.position > 3 end)
+ local list = RoleManager.Query(function(v) return v.position > 3 and v.camp==role.camp end)
for _, r in ipairs(list) do
r:AddRage(i1, CountTypeName.Add)
end
@@ -3235,9 +3235,9 @@ local passivityList = {
local af = 0
local onSkillCast = function(skill)
- local targets = skill:GetDirectTargets()
- if targets and #targets > 0 then
- af = BattleUtil.ErrorCorrection(f1/#targets)
+ local maxNum = skill:GetMaxTargetNum()
+ if maxNum and maxNum > 0 then
+ af = BattleUtil.ErrorCorrection(f1/maxNum)
end
end
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast)
@@ -3309,9 +3309,9 @@ local passivityList = {
local af = 0
local onSkillCast = function(skill)
- local targets = skill.effectTargets[2]
- if targets and #targets > 0 then
- af = BattleUtil.ErrorCorrection(f1/#targets)
+ local maxNum = skill:GetMaxTargetNum()
+ if maxNum and maxNum > 0 then
+ af = BattleUtil.ErrorCorrection(f1/maxNum)
end
end
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast)
@@ -3365,9 +3365,9 @@ local passivityList = {
local af = 0
local onSkillCast = function(skill)
- local targets = skill:GetDirectTargets()
- if targets and #targets > 0 then
- af = BattleUtil.ErrorCorrection(f1/#targets)
+ local maxNum = skill:GetMaxTargetNum()
+ if maxNum and maxNum > 0 then
+ af = BattleUtil.ErrorCorrection(f1/maxNum)
end
end
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast)
@@ -3436,9 +3436,9 @@ local passivityList = {
local af = 0
local onSkillCast = function(skill)
- local targets = skill:GetDirectTargets()
- if targets and #targets > 0 then
- af = BattleUtil.ErrorCorrection(f1/#targets)
+ local maxNum = skill:GetMaxTargetNum()
+ if maxNum and maxNum > 0 then
+ af = BattleUtil.ErrorCorrection(f1/maxNum)
end
end
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast)
@@ -3714,15 +3714,24 @@ local passivityList = {
local f1 = args[1]
local OnRoleDamageBefore = function(defRole, factorFunc, damageType, skill)
- local targets = skill:GetDirectTargets()
- if not targets or #targets == 0 then return end
- local cf = f1/#targets
- for _, target in ipairs(targets) do
- BattleUtil.RandomAction(cf, function()
- BattleLogic.BuffMgr:ClearBuff(target, function(buff)
- return buff.type == BuffName.Shield and buff.shieldType == ShieldTypeName.AllReduce
+ if skill then
+ -- 计算概率
+ local cf = f1
+ local maxNum = skill:GetMaxTargetNum()
+ if maxNum and maxNum > 0 then
+ cf = cf/maxNum
+ end
+
+ local targets = skill:GetDirectTargets()
+ if not targets or #targets == 0 then return end
+
+ for _, target in ipairs(targets) do
+ BattleUtil.RandomAction(cf, function()
+ BattleLogic.BuffMgr:ClearBuff(target, function(buff)
+ return buff.type == BuffName.Shield and buff.shieldType == ShieldTypeName.AllReduce
+ end)
end)
- end)
+ end
end
end
role.Event:AddEvent(BattleEventName.RoleDamageBefore, OnRoleDamageBefore)
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua
index aad4d7f13b..2e27d7c2d4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua
@@ -208,7 +208,7 @@ function Skill:Cast(func)
--技能的施法时间计算,根据当前目标id关联的持续时间,取其中时间最长的一个
local duration = self.hitTime + self.continueTime
-- 结算时间向后延长0.2秒,避免在效果结算完成前就结束了技能释放
- BattleLogic.WaitForTrigger(duration + 0.2, function()
+ BattleLogic.WaitForTrigger(duration + 0.4, function()
self.owner.Event:DispatchEvent(BattleEventName.SkillCastEnd, self)
BattleLogic.Event:DispatchEvent(BattleEventName.SkillCastEnd, self)
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua
index fe331632ba..26a9f07e80 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua
@@ -161,6 +161,12 @@ end
-- 改变怒气值
function RoleLogic:AddRage(value, type)
+ -- 角色身上有无敌盾,不扣除怒气 by:wangzhenxing 2020/08/10 14:56
+ if (type==3 or type==4) and BattleLogic.BuffMgr:HasBuff(self, BuffName.Shield, function (buff) return buff.shieldType and buff.shieldType == ShieldTypeName.AllReduce end) then
+ LogError("角色身上有无敌盾,不扣除怒气")
+ return
+ end
+
local delta = 0
if type == 1 then --加算
delta = value
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
index e5ae4ec056..7e336f28ba 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
@@ -179,6 +179,7 @@ function this.InitCompShow()
end
function this.SetStaticData()
+ LogGreen("EndLessMapManager.openMapId "..EndLessMapManager.openMapId)
local mapData = endLessConfig[EndLessMapManager.openMapId]
if not mapData then Log(Language[10362]) end
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua
index cbdeee00f1..2e645163b4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/PlotRewardPreviewPupop.lua
@@ -1,4 +1,4 @@
-require("Base/BasePanel")
+require("Base/BasePanel")
PlotRewardPreviewPupop = Inherit(BasePanel)
local this = PlotRewardPreviewPupop
--local starConfig = ConfigManager.GetConfig(ConfigName.ChallengeStarBox)
diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
index 084952fee9..78a74530ab 100644
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
@@ -1,4 +1,4 @@
-require("Base/BasePanel")
+require("Base/BasePanel")--(24暂时关闭)prefab中的天宫秘宝入口被关闭,记得开启,按钮底下还有个底儿
ExpeditionMainPanel = Inherit(BasePanel)
local this = ExpeditionMainPanel
local nodeGrid = {}
@@ -41,7 +41,6 @@ function ExpeditionMainPanel:InitComponent()
self.Btn2 = Util.GetGameObject(self.parent, "lowGO/Btn2")
self.Btn3 = Util.GetGameObject(self.parent, "lowGO/Btn3")
self.Btn4 = Util.GetGameObject(self.parent, "upLeftGo/Btn4")
- self.Btn4Image = Util.GetGameObject(self.parent, "upLeftGo/Image")
self.Btn5 = Util.GetGameObject(self.parent, "lowGO/Btn5")
self.helpBtn = Util.GetGameObject(self.parent, "upLeftGo/helpBtn")
self.redPoint = Util.GetGameObject(self.parent, "upLeftGo/Btn4/redPoint")
@@ -59,6 +58,8 @@ function ExpeditionMainPanel:InitComponent()
end
nodeItemGrid[i] = nodeGridItemsGri
end
+ --self.mask = Util.GetGameObject(self.parent, "mask")
+ --self.mask:SetActive(false)
npc = NameManager.roleSex == ROLE_SEX.BOY and "live2d_npc_map" or "live2d_npc_map_nv"
local scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one*0.2 or Vector3.one * 0.12
self.liveNode = poolManager:LoadLive(npc, Util.GetTransform(self.parent, "playerLive"), scale, Vector3.zero)
@@ -233,11 +234,15 @@ function ExpeditionMainPanel:OnShowNodeData(isMoveGrid)
self.grid:GetComponent("RectTransform").anchoredPosition = Vector3.New(0,y,0)
end
end
-
- if not RECHARGEABLE then--(是否开启充值)
- self.Btn4:SetActive(false)
- self.Btn4Image:SetActive(false)
- end
+ --self.ScrollView:SetData(curAllLayNodeList, function (index, go)
+ -- self:SingleLayNodeShow(go,curAllLayNodeList[index],(#AllLayNodeList - index) + 1)
+ --end)
+ --LogError("#AllLayNodeList - GetCurNodeInfo.lay "..#AllLayNodeList - GetCurNodeInfo.lay)
+ --local curIndex = #AllLayNodeList - GetCurNodeInfo.lay
+ --if curIndex == 0 then
+ -- curIndex = curIndex + 1
+ --end
+ --self.ScrollView:SetIndex(curIndex)
end
--实例化每层信息
@@ -546,6 +551,13 @@ end
--界面销毁时调用(用于子类重写)
function ExpeditionMainPanel:OnDestroy()
+ --if live2dList and #live2dList > 0 then
+ -- for i = 1, #live2dList do
+ -- poolManager:UnLoadLive(live2dList[i][1], live2dList[i][2], PoolManager.AssetType.GameObject)
+ -- live2dList[i] = nil
+ -- end
+ --end
+ --live2dList = {}
if self.liveNode then
poolManager:UnLoadLive(npc, self.liveNode, PoolManager.AssetType.GameObject)
self.liveNode = nil
@@ -563,6 +575,12 @@ function ExpeditionMainPanel:InitLiveSet(iconId, go)
local configData = ConfigManager.GetConfigData(ConfigName.ExpeditionNodeConfig,iconId)
local live2d = poolManager:LoadLive(configData.Icon, Util.GetTransform(go, "goParent"),
Vector3.one * configData.Scale, Vector3.New(configData.Position[1], configData.Position[2],0))
+ --local curLive = {configData.Icon,live2d}
+ --table.insert(live2dList,curLive)
+ --local skeleton = live2d:GetComponent("SkeletonGraphic")
+ --if skeleton and iconId == 2 then--首领
+ -- skeleton.AnimationState:SetAnimation(0, "idle2", true)
+ --end
return {name=configData.Icon, go=live2d}
end
-- 设置文本透明度
@@ -579,8 +597,10 @@ end
function ExpeditionMainPanel:SingleNodeInfoIconShow(nodeGo,layNodeData)
local infoIcon = Util.GetGameObject(nodeGo, "infoIcon")
local warPowerGo = Util.GetGameObject(infoIcon, "warPowerGo")
+ --local iconImage = Util.GetGameObject(warPowerGo, "iconImage"):GetComponent("Image")
local powerText = Util.GetGameObject(warPowerGo, "powerText"):GetComponent("Text")
local textIconGo = Util.GetGameObject(infoIcon, "textIconGo")
+ --local iconImage2 = Util.GetGameObject(textIconGo, "iconImage"):GetComponent("Image")
infoIcon :SetActive(false)
warPowerGo:SetActive(false)
textIconGo:SetActive(false)
@@ -594,7 +614,21 @@ function ExpeditionMainPanel:SingleNodeInfoIconShow(nodeGo,layNodeData)
warPowerGo:SetActive(true)
powerText.text = layNodeData.bossTeaminfo.totalForce
end
-
+ --if GetCurNodeInfo.lay == layNodeData.lay then--当前层
+ -- if layNodeData.type == ExpeditionNodeType.Jy or layNodeData.type == ExpeditionNodeType.Boss or layNodeData.type == ExpeditionNodeType.Common then
+ -- warPowerGo:SetActive(false)
+ -- --iconImage.sprite = Util.LoadSprite(ExpeditionManager.NodeInfoIcon[layNodeData.type])
+ -- powerText.text = layNodeData.bossTeaminfo.totalForce
+ -- elseif layNodeData.type == ExpeditionNodeType.Resurgence or layNodeData.type == ExpeditionNodeType.Reply or layNodeData.type == ExpeditionNodeType.Halidom then
+ -- --iconImage2.sprite = Util.LoadSprite(ExpeditionManager.NodeInfoIcon[layNodeData .type])
+ -- end
+ -- if isAllHaveAttack then
+ -- if layNodeData.state == ExpeditionNodeState.No then--关闭 状态
+ -- elseif layNodeData.state == ExpeditionNodeState.NoGetEquip then--未领圣物状态
+ -- --iconImage2.sprite = Util.LoadSprite(ExpeditionManager.NodeInfoIcon[ExpeditionNodeType.Halidom])
+ -- end
+ -- end
+ --end
end
function ExpeditionMainPanel:PlayerMoveFun()
@@ -617,6 +651,7 @@ function ExpeditionMainPanel:PlayerMoveFun()
end):OnComplete(function ()
--Log("行走完毕")
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
+ --self.mask:SetActive(isPlayerMove)
--隐藏该层级所有形象
--播放下落动画
for i = 1, #targetPosGoAndData.layAllData do
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
index 0e13697f15..a1942da2bd 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@@ -915,57 +915,59 @@ local function CalculateHeroUpTalismanProAddVal(_heroId, _breakId, _upStarId,tea
end
--英雄身上魂印属性计算
local function CalculateSoulPrintAddVal(_heroId)
- local allSoulPrintAddWarPowerVal = 0
+
+ -- local allSoulPrintAddWarPowerVal = 0
+ -- local curHeroData = HeroManager.GetSingleHeroData(_heroId)
+ -- if curHeroData then
+ -- if (table.nums(curHeroData.soulPrintList) >= 1) then
+ -- for i = 1, #curHeroData.soulPrintList do
+ -- LogError(_heroId)
+ -- local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId]
+ -- if cursoulPrintConfig then
+ -- allSoulPrintAddWarPowerVal = allSoulPrintAddWarPowerVal + cursoulPrintConfig.Score
+ -- end
+ -- end
+ -- end
+ -- end
+ -- return allSoulPrintAddWarPowerVal
+ local addAllProVal = {}
+ local singleHeroProVal,lvProVal,allHeroProVal,specialProVal
local curHeroData = HeroManager.GetSingleHeroData(_heroId)
if curHeroData then
- if (table.nums(curHeroData.soulPrintList) >= 1) then
- for i = 1, #curHeroData.soulPrintList do
- local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId]
- if cursoulPrintConfig then
- allSoulPrintAddWarPowerVal = allSoulPrintAddWarPowerVal + cursoulPrintConfig.Score
- end
- end
- end
+ if(table.nums(curHeroData.soulPrintList) >= 1) then
+ for i = 1, #curHeroData.soulPrintList do
+ local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId]
+ if cursoulPrintConfig then
+ --基础属性计算
+ local soulPrintPropertyList = cursoulPrintConfig.Property
+ if soulPrintPropertyList and #soulPrintPropertyList > 0 then
+ for i,v in pairs(soulPrintPropertyList) do
+ if(addAllProVal[v[1]]) then
+ addAllProVal[v[1]]=v[2]+addAllProVal[v[1]]
+ else
+ addAllProVal[v[1]]=v[2]
+ end
+ end
+ end
+ --被动技能计算
+ if cursoulPrintConfig.PassiveSkill then
+ --单体加成 --单体等级限制加成 --团体加成 --减乘
+ singleHeroProVal,lvProVal,allHeroProVal,specialProVal = this.CalculatePassiveSkillsValList(WarPowerType.SoulPrint,cursoulPrintConfig.PassiveSkill)
+ end
+ end
+ end
+ end
end
- return allSoulPrintAddWarPowerVal
- --local addAllProVal = {}
- --local singleHeroProVal,lvProVal,allHeroProVal,specialProVal
- --local curHeroData = HeroManager.GetSingleHeroData(_heroId)
- --if curHeroData then
- -- if(table.nums(curHeroData.soulPrintList) >= 1) then
- -- for i = 1, #curHeroData.soulPrintList do
- -- local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId]
- -- if cursoulPrintConfig then
- -- --基础属性计算
- -- local soulPrintPropertyList = cursoulPrintConfig.Property
- -- if soulPrintPropertyList and #soulPrintPropertyList > 0 then
- -- for i,v in pairs(soulPrintPropertyList) do
- -- if(addAllProVal[v[1]]) then
- -- addAllProVal[v[1]]=v[2]+addAllProVal[v[1]]
- -- else
- -- addAllProVal[v[1]]=v[2]
- -- end
- -- end
- -- end
- -- --被动技能计算
- -- if cursoulPrintConfig.PassiveSkill then
- -- --单体加成 --单体等级限制加成 --团体加成 --减乘
- -- singleHeroProVal,lvProVal,allHeroProVal,specialProVal = this.CalculatePassiveSkillsValList(WarPowerType.SoulPrint,cursoulPrintConfig.PassiveSkill)
- -- end
- -- end
- -- end
- -- end
- --end
- --if singleHeroProVal and LengthOfTable(singleHeroProVal) > 0 then
- -- for i,v in pairs(singleHeroProVal) do
- -- if addAllProVal[i] then
- -- addAllProVal[i] = addAllProVal[i] + v
- -- else
- -- addAllProVal[i] = v
- -- end
- -- end
- --end
- --return addAllProVal,lvProVal,allHeroProVal,specialProVal
+ if singleHeroProVal and LengthOfTable(singleHeroProVal) > 0 then
+ for i,v in pairs(singleHeroProVal) do
+ if addAllProVal[i] then
+ addAllProVal[i] = addAllProVal[i] + v
+ else
+ addAllProVal[i] = v
+ end
+ end
+ end
+ return addAllProVal,lvProVal,allHeroProVal,specialProVal
end
--英雄身上宝器属性计算
local function CalculateEquipTreaSureAddVal(_heroId)
@@ -1434,10 +1436,10 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
CalculateHeroPassiveSkillProAddVal(1, teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).heroConfig.PropertyName or nil)
local falismanSingleHeroProVal, falismanLvProVal, falismanAllHeroProVal, falismanSpecialProVal =
CalculateHeroUpTalismanProAddVal(teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).heroConfig.PropertyName or nil)
- --local soulPrinSingleHeroProVal,soulPrinLvProVal,soulPrinAllHeroProVal,soulPrinSpecialProVal = CalculateSoulPrintAddVal(teamHeroInfos[i].heroId)
+ local soulPrinSingleHeroProVal,soulPrinLvProVal,soulPrinAllHeroProVal,soulPrinSpecialProVal = CalculateSoulPrintAddVal(teamHeroInfos[i].heroId)
this.DoubleTableCompound(teamProVal, heroSkillAllHeroProVal)
this.DoubleTableCompound(teamProVal, falismanAllHeroProVal)
- --this.DoubleTableCompound(teamProVal,soulPrinAllHeroProVal)
+ this.DoubleTableCompound(teamProVal,soulPrinAllHeroProVal)
end
end
--光环加成
@@ -1556,7 +1558,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end
--end
--魂印的属性加成
- local allSoulPrintAddWarPowerVal = CalculateSoulPrintAddVal(curHeroData.dynamicId)
+ local singleHeroSoulPrintProVal,lvSoulPrintProVal,allHeroSoulPrintProVal,specialSoulPrintProVal = CalculateSoulPrintAddVal(curHeroData.dynamicId)
-- LogError("魂印的单体属性加成 "..allSoulPrintAddWarPowerVal)
--宝器加成 宝器本身属性 + 宝器激活的强化共鸣 和 精炼共鸣
local equipTreasureAddPro = CalculateEquipTreaSureAddVal(curHeroData.dynamicId)
@@ -1600,19 +1602,19 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro)
this.DoubleTableCompound(allAddProVal, guildSkillAllProAdd)
this.DoubleTableCompound(allAddProVal, falismanSingleHeroProVal)
- --this.DoubleTableCompound(allAddProVal,soulPrinSingleHeroProVal)
+ this.DoubleTableCompound(allAddProVal,singleHeroSoulPrintProVal)
this.DoubleTableCompound(allAddProVal, playerDcorateAdd)
this.DoubleTableCompound(allAddProVal, heroSkillSingleHeroProVal)
this.DoubleTableCompound(allAddProVal, equipTreasureAddPro)
this.DoubleTableCompound(allAddProVal, vipAddPro)
--100等级所有属性合并
this.DoubleTableCompound(lvProVal, falismanLvProVal)
- --this.DoubleTableCompound(lvProVal,soulPrinLvProVal)
+ this.DoubleTableCompound(lvProVal,lvSoulPrintProVal)
this.DoubleTableCompound(lvProVal, heroSkillLvProVal)
--团体所有属性合并
if not _isAllHeroProVal then
this.DoubleTableCompound(allHeroProVal, falismanAllHeroProVal)
- --this.DoubleTableCompound(allHeroProVal,soulPrinAllHeroProVal)
+ this.DoubleTableCompound(allHeroProVal,allHeroSoulPrintProVal)
this.DoubleTableCompound(allHeroProVal, heroSkillAllHeroProVal)
this.DoubleTableCompound(allHeroProVal, teamAddPro)
end
@@ -1623,7 +1625,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end
--4公式特殊(减乘)所有属性加成
this.DoubleTableCompound(specialProVal, falismanSpecialProVal)
- --this.DoubleTableCompound(specialProVal,soulPrinSpecialProVal)
+ this.DoubleTableCompound(specialProVal,specialSoulPrintProVal)
this.DoubleTableCompound(specialProVal, heroSkillSpecialProVal)
--100等级所有属性合并
local forNum = curLvNum - 100
@@ -1739,10 +1741,10 @@ curHeroData.MLSproList={}
if _type == 1 then
--最后加魂印战力
allAddProVal[HeroProType.WarPower] =
- allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal
+ allEquipScore + CalculateWarForce(allAddProVal)
elseif _type == 2 then
allAddProVal[HeroProType.WarPower] =
- allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal
+ allEquipScore + CalculateWarForce(allAddProVal)
--最后加魂印战力
end
--for i, v in pairs(allAddProVal) do
diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
index b1a26de3f7..5d037d5789 100644
--- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
@@ -193,7 +193,8 @@ function this:InitComponent()
this.btnRank = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnRank")
this.rankRed = Util.GetGameObject(this.btnRank, "redPoint")
-
+ -- 无尽
+ this.btnEndLess = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnEndLess")
-- 设置
--this.btnSet = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnSetting")
@@ -704,6 +705,10 @@ function this:BindEvent()
end
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ALLRANKING)
end)
+
+ Util.AddClick(this.btnEndLess, function()
+ UIManager.OpenPanel(UIName.EndLessCarbonPanel)
+ end)
-- Util.AddClick(this.btnGuanxing, function()
-- JumpManager.GoJump(1024)
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ASPECT_STAR)
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
index 85c49fe711..2748045cf4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
@@ -132,6 +132,7 @@ function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Map.MapDataChange, this.OnMapDataChange)
Game.GlobalEvent:AddEvent(GameEvent.Map.StopWalk, this.StopWalking)
Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.RefreshBuffShow)
+ -- Game.GlobalEvent:AddEvent(GameEvent.Map.MaskState, this.MaskState)
missionView.AddListener()
playerView.AddListener()
@@ -151,6 +152,7 @@ function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Map.MapDataChange, this.OnMapDataChange)
Game.GlobalEvent:RemoveEvent(GameEvent.Map.StopWalk, this.StopWalking)
Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.RefreshBuffShow)
+ -- Game.GlobalEvent:RemoveEvent(GameEvent.Map.MaskState, this.MaskState)
missionView.RemoveListener()
playerView.RemoveListener()
@@ -247,14 +249,22 @@ end
function this.InitCarbonSet()
-- 面板遮罩
- this.Mask:SetActive(not MapManager.isOpen)
-
+ this.MaskState(1)
+ local timer = Timer.New(function()
+ this.MaskState(0)
+ end, 2.5)
+ timer:Start()
--如果是在序章
local isStartMap = MapManager.curMapId == 100
this.BtnBack:SetActive(not isStartMap)
end
+--设置遮罩开关 1 是开 其他都是关
+function this.MaskState(state)
+ this.Mask:SetActive(state == 1)
+end
+
-- 根据副本的类型显示组件
function this.InitCompShow(type)
this.leftUp:SetActive(type == 2)
@@ -286,7 +296,7 @@ function this.SetRoleShow(scale, pos)
DG.Tweening.Core.DOSetter_float(TileMapController.SetScale),
scale, 1):SetEase(Ease.Linear):OnComplete(function ()
- this.Mask:SetActive(false)
+ -- this.Mask:SetActive(false)
playerView.Init(pos)
-- 进图初始化完成
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua
index 1171ce8f90..08a961918c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua
@@ -31,10 +31,12 @@ end
function this:BindEvent()
Util.AddClick(this.e_cancelBtn,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
+ Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
self:ClosePanel()
end)
Util.AddClick(this.btnBack,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
+ Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
self:ClosePanel()
end)
@@ -66,16 +68,21 @@ function this:BindEvent()
local fightData = BattleManager.GetBattleServerData(msg)
- UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
+ UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
--更新精气值
LogGreen(Language[12222]..msg.essenceValue)
MapTrialManager.powerValue = msg.essenceValue
+
--召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
MapTrialManager.isHaveBoss = true
MapTrialManager.UpdatePowerValue(0)
end
- CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
+ -- 延迟一秒刷新显示,避免战斗界面关闭时地图界面没有打开,无法监听删点事件,导致怪物点无法删除的问题
+ Timer.New(function()
+ -- 刷新数据
+ CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
+ end, 0.2):Start()
end)
self:ClosePanel()
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
index f1db10396f..6be0867be9 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
@@ -231,7 +231,8 @@ function this.UpdatePowerValue()
this.powerPercent.text = _value
this.sliderValue.fillAmount = _value / 100
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
-
+ -- LogPurple("战斗结束")
+ Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
-- -1时召唤boss
if powerValue == -1 then
this.bossEffect:SetActive(true)--进图显示召唤boss
diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
index b9558ff314..fbaf3ba106 100644
--- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
@@ -465,6 +465,8 @@ function this.EdgeEventTrigger(u, v)
end
Log(Language[11304] .. MapManager.mapPointList[pos])
+ -- LogGreen("事件开始")
+ Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,1)
--如果英雄阵亡 无法选择其进行战斗
local num = #MapManager.trialHeroInfo
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
index 46b89ee8be..2512e3fd8f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
@@ -120,7 +120,7 @@ function this.ClosePanelRefreshData()
end
--界面关闭时调用(用于子类重写)
function BattleFailPopup:OnClose()
-
+ Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
end
--界面销毁时调用(用于子类重写)
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
index 5af1f27b33..bf49b22805 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
@@ -463,7 +463,7 @@ function RewardItemPopup:ItemDataListSort(itemDataList)
end
--界面关闭时调用(用于子类重写)
function RewardItemPopup:OnClose()
-
+ BagManager.SetDropIsSHowEquipPrint(true)
local fightConFigData = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, FightPointPassManager.curOpenFight)
if compShowType == 1 then
compShowType = 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua
index 0be357353b..4ad484105e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua
@@ -36,6 +36,7 @@ function this:BindEvent()
NetManager.UseAndPriceItemRequest(3, data, function(msg)
HeroManager.DeleteHeroDatas(data)
parent:ClosePanel()
+ BagManager.SetDropIsSHowEquipPrint(false)
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1,function ()
ResolvePanel.SwitchView(1)
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
index 1279c3a421..e26c1a80b1 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
@@ -1278,6 +1278,7 @@ function RoleInfoPanel:StarUpClick()
UIManager.OpenPanel(UIName.RoleUpStarSuccessPanel,curHeroData,upStarRankUpConfig.Id,upStarRankUpConfig.OpenLevel,function ()
local dropItemTabs = BagManager.GetTableByBackDropData(msg)
if #dropItemTabs > 0 then
+ BagManager.SetDropIsSHowEquipPrint(false)
UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1, function ()
self:DeleteUpStarMaterials()
end)
diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
index 718b5317ac..db2ba101de 100644
--- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
+++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
@@ -14,351 +14,351 @@ MonoBehaviour:
m_EditorClassIdentifier:
_keys:
- F:\jielingNew/data_execl/base_data\ActivityDropReward.xlsx
- - F:\jielingNew/data_execl/base_data\ErrorCodeEerverConfig.xlsx
- - F:\jielingNew/data_execl/base_data\AdventureReward.xlsx
- - F:\jielingNew/data_execl/base_data\AreaConfig.xlsx
- - F:\jielingNew/data_execl/base_data\AdventureConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ArenaBattleReward.xlsx
- - F:\jielingNew/data_execl/base_data\ArenaRobotSetting.xlsx
- - F:\jielingNew/data_execl/base_data\ArenaReward.xlsx
- - F:\jielingNew/data_execl/base_data\ArenaSetting.xlsx
- - F:\jielingNew/data_execl/base_data\BlessingConfig.xlsx
- - F:\jielingNew/data_execl/base_data\FakeBattle.xlsx
- - F:\jielingNew/data_execl/base_data\BlessingRewardPool.xlsx
- - F:\jielingNew/data_execl/base_data\BeStronger.xlsx
- - F:\jielingNew/data_execl/base_data\GameSetting.xlsx
- - F:\jielingNew/data_execl/base_data\ErrorCodeHint.xlsx
- - F:\jielingNew/data_execl/base_data\BloodyMessagesConfig.xlsx
- - F:\jielingNew/data_execl/base_data\BeginnerTask.xlsx
- - F:\jielingNew/data_execl/base_data\AudioConfig.xlsx
- - F:\jielingNew/data_execl/base_data\FoodsConfig.xlsx
- - F:\jielingNew/data_execl/base_data\BloodyBattleReward.xlsx
- - F:\jielingNew/data_execl/base_data\ArenaRobotConfig.xlsx
- - F:\jielingNew/data_execl/base_data\DifferDemonsBoxSeaons.xlsx
- - F:\jielingNew/data_execl/base_data\DifferDemonsBoxPools.xlsx
- - F:\jielingNew/data_execl/base_data\ChallengeMapConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ChapterOptionConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ExchangeActivityConfig.xlsx
- - F:\jielingNew/data_execl/base_data\DifferDemonsConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ExpeditionFloorConfig.xlsx
- - F:\jielingNew/data_execl/base_data\DialRewardSetting.xlsx
- - F:\jielingNew/data_execl/base_data\DialRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\AchievementConfig.xlsx
- - F:\jielingNew/data_execl/base_data\BloodyBattleSetting.xlsx
- - F:\jielingNew/data_execl/base_data\GuildScoreConfig.xlsx
- - F:\jielingNew/data_execl/base_data\DifferDemonsStageConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ChallengeConfig.xlsx
- - F:\jielingNew/data_execl/base_data\DifferDemonsBoxSetting.xlsx
- - F:\jielingNew/data_execl/base_data\DailyTasksConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ChampionshipReward.xlsx
- - F:\jielingNew/data_execl/base_data\ChampionshipSetting.xlsx
- - F:\jielingNew/data_execl/base_data\BloodyBattleTask.xlsx
- - F:\jielingNew/data_execl/base_data\BloodyBattleTreasure.xlsx
- - F:\jielingNew/data_execl/base_data\DailyChallengeConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ChallengeStarBox.xlsx
- - F:\jielingNew/data_execl/base_data\ChallengeSetting.xlsx
- - F:\jielingNew/data_execl/base_data\GuildSetting.xlsx
- - F:\jielingNew/data_execl/base_data\BloodyRankConfig.xlsx
- - F:\jielingNew/data_execl/base_data\AccomplishmentConfig.xlsx
- - F:\jielingNew/data_execl/base_data\CombatControl.xlsx
- - F:\jielingNew/data_execl/base_data\ChallengeMissionConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ExploreFunctionConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ExpeditionRecruitConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ExpeditionSetting.xlsx
- F:\jielingNew/data_execl/base_data\ActivityRankingReward.xlsx
- - F:\jielingNew/data_execl/base_data\HeroRankupGroup.xlsx
- - F:\jielingNew/data_execl/base_data\HeroRankupConfig.xlsx
- - F:\jielingNew/data_execl/base_data\JewelResonanceConfig.xlsx
- - F:\jielingNew/data_execl/base_data\DialogueViewConfig.xlsx
- - F:\jielingNew/data_execl/base_data\JumpConfig.xlsx
- - F:\jielingNew/data_execl/base_data\JewelConfig.xlsx
- - F:\jielingNew/data_execl/base_data\LevelSetting.xlsx
- - F:\jielingNew/data_execl/base_data\LoginPosterConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GlobalSystemConfig.xlsx
- - F:\jielingNew/data_execl/base_data\LotterySetting.xlsx
- - F:\jielingNew/data_execl/base_data\LotterySpecialConfig.xlsx
- - F:\jielingNew/data_execl/base_data\LuckyCatConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildSacrificeRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\BuffEffectConfig.xlsx
- - F:\jielingNew/data_execl/base_data\MazeTreasure.xlsx
- - F:\jielingNew/data_execl/base_data\HeroSacrifice.xlsx
+ - F:\jielingNew/data_execl/base_data\ErrorCodeHint.xlsx
+ - F:\jielingNew/data_execl/base_data\AchievementConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ExchangeActivityConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ExpeditionFloorConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ExpeditionNodeConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ExpeditionRecruitConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionHolyConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ExploreFunctionConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ArenaBattleReward.xlsx
+ - F:\jielingNew/data_execl/base_data\AreaConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ArenaReward.xlsx
+ - F:\jielingNew/data_execl/base_data\AdventureReward.xlsx
+ - F:\jielingNew/data_execl/base_data\ArenaRobotConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\FakeBattle.xlsx
+ - F:\jielingNew/data_execl/base_data\ExpeditionSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\ErrorCodeEerverConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\BuffEffectConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EquipSuiteConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EquipStarsConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\BloodyBattleTask.xlsx
+ - F:\jielingNew/data_execl/base_data\AccomplishmentConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GameSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\ArenaSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\FoodsConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\BloodyBattleSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\GlobalSystemConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GlobalActivity.xlsx
+ - F:\jielingNew/data_execl/base_data\BlessingRewardPool.xlsx
+ - F:\jielingNew/data_execl/base_data\BloodyBattleReward.xlsx
+ - F:\jielingNew/data_execl/base_data\BlessingConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\BeStronger.xlsx
+ - F:\jielingNew/data_execl/base_data\AdventureConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuideConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\BeginnerTask.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildScoreConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ArenaRobotSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\AudioConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildSacrificeRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildWarConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildHelpConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EquipSignSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildSacrificeConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildBossConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildLevelConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildRedPackConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\HeroRankupConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\HeroRankupGroup.xlsx
+ - F:\jielingNew/data_execl/base_data\JewelResonanceConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\FloodConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\LevelSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\EquipPropertyPool.xlsx
+ - F:\jielingNew/data_execl/base_data\EquipSign.xlsx
+ - F:\jielingNew/data_execl/base_data\LotterySetting.xlsx
+ - F:\jielingNew/data_execl/base_data\JumpConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\LoginPosterConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildWarRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildBossRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EquipTalismanaLottery.xlsx
+ - F:\jielingNew/data_execl/base_data\JewelConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\MonthcardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\MonsterViewConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\OptionAddCondition.xlsx
+ - F:\jielingNew/data_execl/base_data\HeroSacrifice.xlsx
- F:\jielingNew/data_execl/base_data\PlayerAppearance.xlsx
- F:\jielingNew/data_execl/base_data\PlayerLevelConfig.xlsx
- - F:\jielingNew/data_execl/base_data\LuxuryFund.xlsx
- - F:\jielingNew/data_execl/base_data\FloodConfig.xlsx
- - F:\jielingNew/data_execl/base_data\HeroReturn.xlsx
- - F:\jielingNew/data_execl/base_data\LotteryRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ChapterEventPointConfig.xlsx
- - F:\jielingNew/data_execl/base_data\LevelDifficultyConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GlobalActivity.xlsx
- - F:\jielingNew/data_execl/base_data\RunesConfig.xlsx
- - F:\jielingNew/data_execl/base_data\SevenDaysActivity.xlsx
- - F:\jielingNew/data_execl/base_data\RunesPoolConfig.xlsx
- - F:\jielingNew/data_execl/base_data\SeverConfig.xlsx
- - F:\jielingNew/data_execl/base_data\MainLevelSettingConfig.xlsx
- - F:\jielingNew/data_execl/base_data\JewelRankupConfig.xlsx
- - F:\jielingNew/data_execl/base_data\OptionAddCondition.xlsx
- F:\jielingNew/data_execl/base_data\ActivityRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\EquipStarsConfig.xlsx
- - F:\jielingNew/data_execl/base_data\PlayerRole.xlsx
- - F:\jielingNew/data_execl/base_data\MissionEventsConfig.xlsx
- - F:\jielingNew/data_execl/base_data\MonsterViewConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildBossRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\MainMapIconConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TreasureSunlongTaskConfig.xlsx
- - F:\jielingNew/data_execl/base_data\SevenDaysScore.xlsx
- - F:\jielingNew/data_execl/base_data\EndlessDifficulty.xlsx
- - F:\jielingNew/data_execl/base_data\ExpeditionNodeConfig.xlsx
- - F:\jielingNew/data_execl/base_data\EquipPropertyPool.xlsx
- - F:\jielingNew/data_execl/base_data\GuildBossConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildWarConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildRedPackConfig.xlsx
- - F:\jielingNew/data_execl/base_data\MazeTreasureSetting.xlsx
- - F:\jielingNew/data_execl/base_data\EquipTalismanaRankup.xlsx
- - F:\jielingNew/data_execl/base_data\GuildRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ElementalResonanceConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildWarRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\PropertyConfig.xlsx
- - F:\jielingNew/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuideConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ArtResourcesConfig.xlsx
- - F:\jielingNew/data_execl/base_data\ItemConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildSacrificeConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\LotteryRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EndlessMapConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\LevelDifficultyConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroLevelConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildLevelConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorkShopTechnologySetting.xlsx
- - F:\jielingNew/data_execl/base_data\TaskConfig.xlsx
- - F:\jielingNew/data_execl/base_data\StoreTypeConfig.xlsx
- - F:\jielingNew/data_execl/base_data\VipLevelConfig.xlsx
- - F:\jielingNew/data_execl/base_data\MonthcardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorldBossSetting.xlsx
- - F:\jielingNew/data_execl/base_data\RoleConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorkShopSetting.xlsx
- - F:\jielingNew/data_execl/base_data\WorkShopEquipmentConfig.xlsx
- - F:\jielingNew/data_execl/base_data\EquipTalismanaLottery.xlsx
- - F:\jielingNew/data_execl/base_data\WorkShopRebuildConfig.xlsx
- - F:\jielingNew/data_execl/base_data\RechargeCommodityConfig.xlsx
- - F:\jielingNew/data_execl/base_data\EquipSign.xlsx
+ - F:\jielingNew/data_execl/base_data\ElementalResonanceConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\DifferDemonsBoxPools.xlsx
+ - F:\jielingNew/data_execl/base_data\HeroReturn.xlsx
+ - F:\jielingNew/data_execl/base_data\DifferDemonsBoxSeaons.xlsx
+ - F:\jielingNew/data_execl/base_data\ChallengeSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\DifferDemonsConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\RunesPoolConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\SevenDaysActivity.xlsx
+ - F:\jielingNew/data_execl/base_data\SevenDaysScore.xlsx
+ - F:\jielingNew/data_execl/base_data\SeverConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\SignInConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EndlessDifficulty.xlsx
+ - F:\jielingNew/data_execl/base_data\ChampionshipSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\DailyChallengeConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ChallengeMapConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ChallengeConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\SpecialConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\PlayerMountLevelUp.xlsx
+ - F:\jielingNew/data_execl/base_data\ChallengeStarBox.xlsx
- F:\jielingNew/data_execl/base_data\HeroConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorkShopFunctionConfig.xlsx
- - F:\jielingNew/data_execl/base_data\PlayerMountLevelUp.xlsx
- - F:\jielingNew/data_execl/base_data\QAConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TrialwelfareConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TrialGameConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorldBossRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\EquipSuiteConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorkShopFoundationConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TrialQuestionConfig.xlsx
- - F:\jielingNew/data_execl/base_data\RecommendTeam.xlsx
- - F:\jielingNew/data_execl/base_data\EndlessMapConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TrialKillConfig.xlsx
- - F:\jielingNew/data_execl/base_data\PassiveSkillConfig.xlsx
- - F:\jielingNew/data_execl/base_data\SpecialConfig.xlsx
- - F:\jielingNew/data_execl/base_data\SystemMessageConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TestWelfare.xlsx
- - F:\jielingNew/data_execl/base_data\RaceTowerRewardConfig.xlsx
- - F:\jielingNew/data_execl/base_data\SignInConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TrialSetting.xlsx
- - F:\jielingNew/data_execl/base_data\WorldBossTreasureConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorldBossConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TreasureTaskConfig.xlsx
- - F:\jielingNew/data_execl/base_data\PrivilegeTypeConfig.xlsx
- - F:\jielingNew/data_execl/base_data\EquipSignSetting.xlsx
- - F:\jielingNew/data_execl/base_data\TreasureSunlongConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\BloodyRankConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\DailyTasksConfig.xlsx
- F:\jielingNew/data_execl/base_data\RewardItemConfig.xlsx
- - F:\jielingNew/data_execl/base_data\GuildTechnology.xlsx
+ - F:\jielingNew/data_execl/base_data\PassiveSkillConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\PropertyConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\TrialSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\TrialwelfareConfig.xlsx
- F:\jielingNew/data_execl/base_data\RaceTowerConfig.xlsx
- - F:\jielingNew/data_execl/base_data\PassiveSkillLogicConfig.xlsx
- - F:\jielingNew/data_execl/base_data\UIConfig.xlsx
- - F:\jielingNew/data_execl/base_data\RandomName.xlsx
- - F:\jielingNew/data_execl/base_data\MapPointConfig.xlsx
- - F:\jielingNew/data_execl/base_data\TrialConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\QAConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\VipLevelConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorkShopEquipmentConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\TrialKillConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\JewelRankupConfig.xlsx
- F:\jielingNew/data_execl/base_data\SkillConfig.xlsx
- - F:\jielingNew/data_execl/base_data\EventPointConfig.xlsx
- - F:\jielingNew/data_execl/base_data\WorkShopTechnology.xlsx
- - F:\jielingNew/data_execl/base_data\StoreConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\UIConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\TrialQuestionConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\PlayerRole.xlsx
+ - F:\jielingNew/data_execl/base_data\WorldBossRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorldBossSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\GuildTechnology.xlsx
+ - F:\jielingNew/data_execl/base_data\MissionEventsConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorkShopFoundationConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\LuckyCatConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\MazeTreasureSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\BloodyMessagesConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorldBossTreasureConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\TreasureSunlongTaskConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorkShopFunctionConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EquipTalismanaRankup.xlsx
+ - F:\jielingNew/data_execl/base_data\BloodyBattleTreasure.xlsx
+ - F:\jielingNew/data_execl/base_data\RunesConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\TestWelfare.xlsx
+ - F:\jielingNew/data_execl/base_data\ChampionshipReward.xlsx
+ - F:\jielingNew/data_execl/base_data\TrialGameConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\TaskConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\LuxuryFund.xlsx
+ - F:\jielingNew/data_execl/base_data\DialRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ChapterOptionConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\TreasureTaskConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\DialRewardSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\TreasureSunlongConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ItemConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ArtResourcesConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\PrivilegeTypeConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ChallengeMissionConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\RechargeCommodityConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\RoleConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\SystemMessageConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\RecommendTeam.xlsx
+ - F:\jielingNew/data_execl/base_data\StoreTypeConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\RandomName.xlsx
+ - F:\jielingNew/data_execl/base_data\DifferDemonsStageConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\CombatControl.xlsx
+ - F:\jielingNew/data_execl/base_data\MainMapIconConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\RaceTowerRewardConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\LotterySpecialConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\DifferDemonsBoxSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\MazeTreasure.xlsx
+ - F:\jielingNew/data_execl/base_data\WorkShopRebuildConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\DialogueViewConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\ChapterEventPointConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorldBossConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorkShopTechnologySetting.xlsx
+ - F:\jielingNew/data_execl/base_data\TrialConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorkShopSetting.xlsx
+ - F:\jielingNew/data_execl/base_data\MainLevelSettingConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\PassiveSkillLogicConfig.xlsx
- F:\jielingNew/data_execl/base_data\SkillLogicConfig.xlsx
- - F:\jielingNew/data_execl/base_data\OptionConfig.xlsx
- - F:\jielingNew/data_execl/base_data\MonsterGroup.xlsx
- - F:\jielingNew/data_execl/base_data\RewardGroup.xlsx
+ - F:\jielingNew/data_execl/base_data\StoreConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\EventPointConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\MapPointConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipTalismana.xlsx
+ - F:\jielingNew/data_execl/base_data\OptionConfig.xlsx
+ - F:\jielingNew/data_execl/base_data\WorkShopTechnology.xlsx
+ - F:\jielingNew/data_execl/base_data\RewardGroup.xlsx
+ - F:\jielingNew/data_execl/base_data\MonsterGroup.xlsx
- F:\jielingNew/data_execl/base_data\MainLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\MonsterConfig.xlsx
_values:
- 3591751192
- - 527608228
- - 613479935
- - 413963702
- - 1848421159
- - 3252026258
- - 2652005642
- - 2296996310
- - 1924824445
- - 309514008
- - 3224705358
- - 732833747
- - 2613230219
- - 636689279
- - 1448464981
- - 4055477448
- - 755222564
- - 4093932632
- - 3226994303
- - 230994945
- - 3947848933
- - 249002466
- - 903221398
- - 4138292608
- - 3033812632
- - 243491956
- - 460607005
- - 1702782288
- - 4198004043
- - 109990768
- - 353142748
- - 2050621784
- - 3079207713
- - 1402356663
- - 2759035733
- - 932779961
- - 2951431547
- - 4243693008
- - 3338153430
- - 2131302457
- - 3507522218
- - 1774803500
- - 1565259591
- - 1705732776
- - 3472737567
- - 3548626589
- - 427098595
- - 3391591373
- - 1572157444
- - 1382260277
- - 1023901955
- - 3674283409
- 1048362391
- - 1493914227
- - 274496341
- - 3597116301
- - 1791256076
- - 2264269610
- - 727009153
- - 3705022903
- - 424986199
- - 3601214530
- - 425543864
- - 3779746387
- - 2479323017
- - 1468913191
- - 2605131572
- - 866186388
- - 4289672541
+ - 1448464981
+ - 353142748
+ - 243491956
+ - 1702782288
+ - 1882717235
+ - 1023901955
- 587159277
+ - 1382260277
+ - 3252026258
+ - 413963702
+ - 2296996310
+ - 613479935
+ - 3947848933
+ - 3224705358
+ - 3674283409
+ - 527608228
+ - 2605131572
+ - 4124958540
+ - 494399256
+ - 2131302457
+ - 427098595
+ - 636689279
+ - 1924824445
+ - 3226994303
+ - 2050621784
+ - 1877416840
+ - 2504417140
+ - 732833747
+ - 230994945
+ - 309514008
+ - 2613230219
+ - 1848421159
+ - 4202904691
+ - 755222564
+ - 3079207713
+ - 2652005642
+ - 2773656346
+ - 1468913191
+ - 3585263874
- 3894020600
+ - 3517900411
+ - 1996735664
+ - 173728414
+ - 3472737567
+ - 3153364400
+ - 1442255327
+ - 475620184
+ - 947577082
+ - 1493914227
+ - 3597116301
+ - 3089114090
+ - 3705022903
+ - 3153107712
+ - 1790592577
+ - 2615195422
+ - 2264269610
+ - 1383251309
+ - 2445182985
+ - 3943131728
+ - 2568046174
+ - 727009153
+ - 1786980484
+ - 515856748
+ - 683415129
+ - 4289672541
- 2534897219
- 1173373930
- - 2903827109
- - 3089114090
- - 322704922
- - 2297407361
- - 3442665542
- - 295715991
- - 3217423894
- - 1155516420
- - 160427834
- - 804383039
- - 2748321716
- - 1393544882
- - 980629513
- - 683415129
- 718427012
- - 494399256
- - 3641128642
- - 3625815197
- - 515856748
- - 3943131728
- - 260126611
- - 898095515
- - 1952787401
- - 1240442055
- - 1882717235
- - 3153107712
- - 173728414
- - 3585263874
- - 475620184
- - 3746847302
- - 2294226303
- - 1442255327
- - 583891024
- - 2445182985
- - 2867634862
- - 568553271
- - 2193911153
- - 4065266353
- - 3896650943
- - 1996735664
+ - 2007302048
+ - 2143974197
+ - 295715991
- 3255901169
- - 3153364400
- - 3048495520
- - 3951547032
- - 185551317
- - 241982493
- - 1786980484
- - 811712663
- - 595208311
- - 3663717884
- - 110435588
- - 2568046174
- - 2777840995
- - 2426257022
- - 1790592577
- - 2233947276
- - 3399006818
- - 2405621183
- - 319164499
- - 2274200675
- - 2854113790
- - 1982645928
- - 967064327
- - 4124958540
- - 98336120
- - 2656593449
- - 66427457
- - 3347320787
- - 739739032
- - 190236436
- - 522503115
- - 297530923
- - 4291486445
- - 2842862470
+ - 583891024
+ - 903221398
+ - 322704922
+ - 249002466
+ - 1705732776
+ - 460607005
+ - 804383039
+ - 160427834
+ - 1952787401
+ - 2748321716
- 29725303
- - 2769353865
- - 625696080
- - 1321320575
- - 1513554725
- - 4109403856
- - 3517900411
- - 1115488926
+ - 1240442055
+ - 3338153430
+ - 1774803500
+ - 4138292608
+ - 2759035733
+ - 3793425517
+ - 319164499
+ - 1565259591
+ - 44417242
+ - 3399006818
+ - 3548626589
+ - 2313402981
- 3785474662
- - 312894044
+ - 190236436
+ - 2867634862
+ - 2769353865
+ - 2854113790
- 4177681514
- - 1507661270
- - 3138213878
- - 38983593
- - 4037636284
- - 3509406354
+ - 1376213266
+ - 241982493
+ - 110435588
+ - 739739032
+ - 980629513
- 1968656445
- - 1518966747
- - 2453679101
+ - 2063938483
+ - 2656593449
+ - 3641128642
+ - 967064327
+ - 811712663
+ - 312894044
+ - 3625815197
+ - 98336120
+ - 2479323017
+ - 3746847302
+ - 4055477448
+ - 568553271
+ - 625696080
+ - 898095515
+ - 2405621183
+ - 2294226303
+ - 3507522218
+ - 1155516420
+ - 4291486445
+ - 4243693008
+ - 1982645928
+ - 3951547032
+ - 2903827109
+ - 3566908170
+ - 3033812632
+ - 884120277
+ - 4198004043
+ - 1115488926
+ - 2933706447
+ - 4065266353
+ - 4109403856
+ - 1572157444
+ - 1361347861
+ - 595208311
+ - 297530923
+ - 66427457
+ - 185551317
+ - 38983593
+ - 1402356663
+ - 3391591373
+ - 260126611
+ - 2842862470
+ - 3682513624
+ - 932779961
+ - 3172113218
+ - 2777840995
+ - 1791256076
+ - 3442665542
+ - 1321320575
+ - 3048495520
+ - 3509406354
+ - 3663717884
+ - 1393544882
+ - 1507661270
+ - 3096694926
- 1953866579
- - 96640120
- - 1704981563
- - 1266460480
- - 3164110821
+ - 1518966747
+ - 4037636284
- 1912768560
+ - 1704981563
+ - 2453679101
+ - 3164110821
+ - 1266460480
- 1397243523
- 3091910782
diff --git a/Assets/Scripts/Editor/convertutf8.cs b/Assets/Scripts/Editor/convertutf8.cs
new file mode 100644
index 0000000000..39c71de91e
--- /dev/null
+++ b/Assets/Scripts/Editor/convertutf8.cs
@@ -0,0 +1,117 @@
+
+using UnityEngine;
+using UnityEditor;
+using System.IO;
+using System.Text;
+
+///
+/// 这个是讲lua文件转化为UTF-8格式的工具
+///
+public class SetLuaToUTF8 : EditorWindow
+{
+ // 常量 //
+ private const string EDITOR_VERSION = "v0.01"; // 这个编辑器的版本号 //
+ // gui 相关 //
+ private Vector2 m_scrollPos; // 记录 gui 界面的滚动 //
+ private string m_luaPath = "ManagedResources/~Lua/"; // 文件路径
+ private string m_fileSuffix = ".lua"; // 文件后缀
+ ///
+ /// 数据目录
+ ///
+ static string AppDataPath
+ {
+ get { return Application.dataPath.ToLower(); }
+ }
+ [MenuItem("Lua/File to UTF-8 Encoding")]
+ static void Init()
+ {
+ Debug.Log("初始化转化lua文件为UTF-8格式");
+ // Get existing open window or if none, make a new one:
+ SetLuaToUTF8 window = (SetLuaToUTF8)EditorWindow.GetWindow(typeof(SetLuaToUTF8));
+ }
+ // UI 按钮显示 //
+ void OnGUI()
+ {
+ m_scrollPos = GUILayout.BeginScrollView(m_scrollPos, GUILayout.Width(Screen.width), GUILayout.Height(Screen.height));
+ GUILayout.BeginVertical(); // begin
+ //-------------- 调试按钮 --------------//
+ // 导出 UI 路径 //
+ GUILayout.Label("===========================");
+ GUILayout.BeginHorizontal();
+ GUILayout.Label("要转化的路径: "); //
+ m_luaPath = GUILayout.TextField(m_luaPath, 64);
+ GUILayout.EndHorizontal();
+ GUILayout.BeginHorizontal();
+ GUILayout.Label("文件后缀: "); //
+ m_fileSuffix = GUILayout.TextField(m_fileSuffix, 64);
+ GUILayout.EndHorizontal();
+ if (GUILayout.Button("\n 文件转utf-8格式 \n")) //
+ {
+ this.Conversion();
+ }
+ //-------------- end 调试按钮 --------------//
+ GUILayout.Space(5);
+ GUILayout.Label("工具版本号: " + EDITOR_VERSION); //
+ GUILayout.EndVertical(); // end
+ GUILayout.EndScrollView();
+ }
+
+ // 开始转化
+ private void Conversion()
+ {
+ if (m_luaPath.Equals(string.Empty))
+ {
+ return;
+ }
+ if (!IsFolderExists(m_luaPath))
+ {
+ Debug.LogError("找不到文件夹路径!");
+ return;
+ }
+ string path = AppDataPath + "/" + m_luaPath;
+ string[] files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
+ foreach (string file in files)
+ {
+ if (!file.EndsWith(m_fileSuffix)) continue;
+ string strTempPath = file.Replace(@"\", "/");
+ Debug.Log("文件路径:" + strTempPath);
+ ConvertFileEncoding(strTempPath, null, new UTF8Encoding(false));
+ }
+ AssetDatabase.Refresh();
+ Debug.Log("格式转换完成!");
+ }
+ /// 检测是否存在文件夹
+ private static bool IsFolderExists(string folderPath)
+ {
+ if (folderPath.Equals(string.Empty))
+ {
+ return false;
+ }
+ return Directory.Exists(GetFullPath(folderPath));
+ }
+ /// 返回Application.dataPath下完整目录
+
+ private static string GetFullPath(string srcName)
+ {
+ if (srcName.Equals(string.Empty))
+ {
+ return Application.dataPath;
+ }
+ if (srcName[0].Equals('/'))
+ {
+ srcName.Remove(0, 1);
+ }
+ return Application.dataPath + "/" + srcName;
+ }
+ ///
+ /// 文件编码转换
+ ///
+ /// 源文件
+ /// 目标文件,如果为空,则覆盖源文件
+ /// 目标编码
+ private static void ConvertFileEncoding(string sourceFile, string destFile, Encoding targetEncoding)
+ {
+ destFile = string.IsNullOrEmpty(destFile) ? sourceFile : destFile;
+ File.WriteAllText(destFile, File.ReadAllText(sourceFile, Encoding.UTF8), targetEncoding);
+ }
+}
diff --git a/Assets/Scripts/Editor/convertutf8.cs.meta b/Assets/Scripts/Editor/convertutf8.cs.meta
new file mode 100644
index 0000000000..2ea1382f13
--- /dev/null
+++ b/Assets/Scripts/Editor/convertutf8.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 861c974ba4188214bbef6c8b3dc18efc
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs b/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
index d6db6967c8..5b2419e60c 100644
--- a/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
+++ b/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
@@ -294,6 +294,22 @@ namespace Spine.Unity {
//this.UpdateMaterial(); // TODO: This allocates memory.
}
- #endregion
- }
+
+
+ protected override void OnDestroy()
+ {
+ if( meshBuffers != null)
+ {
+ var c = meshBuffers.GetCurrent();
+ if( c != null)
+ c.Dispose();
+ var n = meshBuffers.GetNext();
+ if( n != null)
+ {
+ n.Dispose();
+ }
+ }
+ }
+ #endregion
+ }
}
diff --git a/data_execl/base_data/ArtResourcesConfig.xlsx b/data_execl/base_data/ArtResourcesConfig.xlsx
index b3824ecee7..dfc67a5296 100644
Binary files a/data_execl/base_data/ArtResourcesConfig.xlsx and b/data_execl/base_data/ArtResourcesConfig.xlsx differ
diff --git a/data_execl/base_data/AudioConfig.xlsx b/data_execl/base_data/AudioConfig.xlsx
index adfe218204..2693b80adc 100644
Binary files a/data_execl/base_data/AudioConfig.xlsx and b/data_execl/base_data/AudioConfig.xlsx differ
diff --git a/data_execl/base_data/EndlessMapConfig.xlsx b/data_execl/base_data/EndlessMapConfig.xlsx
index 98444a73a8..ef56cbc05f 100644
Binary files a/data_execl/base_data/EndlessMapConfig.xlsx and b/data_execl/base_data/EndlessMapConfig.xlsx differ
diff --git a/data_execl/base_data/GlobalSystemConfig.xlsx b/data_execl/base_data/GlobalSystemConfig.xlsx
index 9f9dc75932..c727ffe0eb 100644
Binary files a/data_execl/base_data/GlobalSystemConfig.xlsx and b/data_execl/base_data/GlobalSystemConfig.xlsx differ
diff --git a/data_execl/base_data/HeroConfig.xlsx b/data_execl/base_data/HeroConfig.xlsx
index 621fee831c..ca605657e2 100644
Binary files a/data_execl/base_data/HeroConfig.xlsx and b/data_execl/base_data/HeroConfig.xlsx differ
diff --git a/data_execl/base_data/HeroRankupConfig.xlsx b/data_execl/base_data/HeroRankupConfig.xlsx
index e3264be73f..1d1d426757 100644
Binary files a/data_execl/base_data/HeroRankupConfig.xlsx and b/data_execl/base_data/HeroRankupConfig.xlsx differ
diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx
index 774d876fdf..fb371ab001 100644
Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ
diff --git a/data_execl/base_data/LotterySetting.xlsx b/data_execl/base_data/LotterySetting.xlsx
index 985107a4e3..b96b334660 100644
Binary files a/data_execl/base_data/LotterySetting.xlsx and b/data_execl/base_data/LotterySetting.xlsx differ
diff --git a/data_execl/base_data/RechargeCommodityConfig.xlsx b/data_execl/base_data/RechargeCommodityConfig.xlsx
index 724c3247a5..7a99f5b27c 100644
Binary files a/data_execl/base_data/RechargeCommodityConfig.xlsx and b/data_execl/base_data/RechargeCommodityConfig.xlsx differ
diff --git a/data_execl/base_data/TreasureTaskConfig.xlsx b/data_execl/base_data/TreasureTaskConfig.xlsx
index d6079eee91..b826975045 100644
Binary files a/data_execl/base_data/TreasureTaskConfig.xlsx and b/data_execl/base_data/TreasureTaskConfig.xlsx differ