Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/MainCheckers/BFSpineChecker.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace BFEditor.Resource
+{
+    public class BFSpineChecker : BFMainChecker
+    {
+        protected override GUIContent InitGUIContent()
+        {
+            return new GUIContent("spine", BFEditorUtils.GetSystemIcon(typeof(Spine.Unity.SkeletonDataAsset)));
+        }
+
+        protected override List<BFSubChecker> InitSubCheckers()
+        {
+            return new List<BFSubChecker>()
+            {
+                new SpineSubChecker(),
+            };
+        }
+    }
+}

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/MainCheckers/BFSpineChecker.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e9c0f8968ad84174b9bc2d446ec36e7b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Prefab/EffectPrefabChecker.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering;
+using BF;
 
 namespace BFEditor.Resource
 {
@@ -58,6 +59,27 @@ namespace BFEditor.Resource
                     result = false;
                 }
             }
+
+            var effectHelper = gameObject.GetComponent<EffectHelper>();
+            if (effectHelper == null)
+            {
+                currentBadRes.AddBadLog(gameObject.name + "没有挂载EffectHelper");
+                result = false;
+            }
+
+            var ParticleSystem = gameObject.GetComponent<ParticleSystem>();
+            if (ParticleSystem != null)
+            {
+                currentBadRes.AddBadLog(gameObject.name + "根节点挂载了ParticleSystem");
+                result = false;
+            }
+
+            var layer = gameObject.layer;
+            if(layer != LayerMask.NameToLayer("UI")) //UI层
+            {
+                currentBadRes.AddBadLog(gameObject.name + "layer不是UI");
+                result = false;
+            }
             return result;
         }
 

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Spine.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d2e9872e68c951b4ea636b9ed46f3e9d
+guid: e339cd1033ed11b4f9e49a9760fef963
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Spine/SpineSubChecker.cs

@@ -0,0 +1,109 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using System.IO;
+
+namespace BFEditor.Resource
+{
+    public class SpineSubChecker : BFSubChecker
+    {
+        Dictionary<string, bool> mustNeedAni = new Dictionary<string, bool>(){
+            {"born", true},
+            {"death", true},
+            {"idle", true},
+            {"suffer", true},
+            {"vertigo", true},
+            {"frozen", true},
+            {"move", true},
+        };
+
+        Dictionary<string, bool> heroMustNeedAni = new Dictionary<string, bool>(){
+            {"attack01", true},
+            {"attack02", true},
+            {"attack03", true},
+            {"attack04", true},
+        };
+
+        Dictionary<string, bool> monsterMustNeedAni = new Dictionary<string, bool>(){
+            {"attack01", true},
+            {"attack02", true},
+            {"attack03", true},
+        };
+
+        public override string InitName()
+        {
+            return "Spine";
+        }
+
+        public override bool DoCheck(string assetPath, AssetImporter assetImporter, Object assetObj)
+        {
+            bool passed = true;
+            if (assetPath.Contains("characters"))
+            {
+                var skeletonDataAsset = AssetDatabase.LoadAssetAtPath<Spine.Unity.SkeletonDataAsset>(assetPath);
+                var animationState = skeletonDataAsset.GetAnimationStateData();
+                Dictionary<string, bool> haveAni = new Dictionary<string, bool>();
+                foreach (var animation in animationState.SkeletonData.Animations)
+                {
+                    haveAni[animation.Name] = true;
+                }
+                foreach (var key in mustNeedAni.Keys)
+                {
+                    if (!haveAni.ContainsKey(key))
+                    {
+                        currentBadRes.AddBadLog("没有动画" + key);
+                        passed = false;
+                    }
+                }
+
+                if (assetPath.Contains("characters/p"))
+                {
+                    foreach (var key in heroMustNeedAni.Keys)
+                    {
+                        if (!haveAni.ContainsKey(key))
+                        {
+                            currentBadRes.AddBadLog("没有动画" + key);
+                            passed = false;
+                        }
+                    }
+                }
+
+                if (assetPath.Contains("characters/m"))
+                {
+                    foreach (var key in monsterMustNeedAni.Keys)
+                    {
+                        if (!haveAni.ContainsKey(key))
+                        {
+                            currentBadRes.AddBadLog("没有动画" + key);
+                            passed = false;
+                        }
+                    }
+                }
+            }
+
+            string floderPath = Path.GetDirectoryName(assetPath);
+            string[] paths = Directory.GetFiles(floderPath);
+            int fileCount = 0;
+            foreach (string unitPath in paths)
+            {
+                if (Path.GetExtension(unitPath) != ".meta")
+                {
+                    fileCount++;
+                }
+            }
+            if (fileCount > 6) // 只能有六个文件
+            {
+                currentBadRes.AddBadLog("文件夹文件数量异常");
+                passed = false;
+            }
+
+            return passed;
+        }
+
+        protected override List<string> GetAssetPathList()
+        {
+            return BFEditorUtils.GetAssetPathsWithSuffix(ResourceProcessConfig.SPINE_TEXTURE_PATH, ".asset", "skeletondata");
+        }
+    }
+}

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Spine/SpineSubChecker.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 45556e9bea3af1b4b96c6e7a1fec9552
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/MainImporters/BFSpineImporter.cs

@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using System.IO;
+
+namespace BFEditor.Resource
+{
+    public class BFSpineImporter : BFMainImporter
+    {
+        protected override List<BFSubImporter> InitSubImporters()
+        {
+            return new List<BFSubImporter>()
+            {
+                new BFSpineSubImporter(),
+            };
+        }
+
+        public override bool NeedDeal(string assetPath)
+        {
+            var suffix = Path.GetExtension(assetPath);
+            return suffix == ".asset";
+        }
+    }
+}

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/MainImporters/BFSpineImporter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aec487ce03f96b141b9363cbb898e894
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Prefab/EffectPrefabImporter.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
 using UnityEngine.Rendering;
+using BF;
 
 namespace BFEditor.Resource
 {
@@ -31,6 +32,20 @@ namespace BFEditor.Resource
                         SetDirty();
                     }
                 }
+                var effectHelper = prefabObj.GetComponent<EffectHelper>();
+                if (effectHelper == null)
+                {
+                    prefabObj.AddComponent<EffectHelper>();
+                    SetDirty();
+                }
+                EffectHelperInspector.OnPrefabSaved(prefabObj);
+
+                var layer = prefabObj.layer;
+                if(layer != LayerMask.NameToLayer("UI")) //UI层
+                {
+                    prefabObj.layer = LayerMask.NameToLayer("UI");
+                    SetDirty();
+                }
             }
         }
     }

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Spine.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f5bc4bc411f27624fa3eb792290cbd09
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Spine/BFSpineSubImporter.cs

@@ -0,0 +1,21 @@
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace BFEditor.Resource
+{
+    public class BFSpineSubImporter : BFSubImporter
+    {
+        public override bool NeedDeal(string assetPath)
+        {
+            return assetPath.Contains(ResourceProcessConfig.SPINE_TEXTURE_PATH);
+        }
+
+        protected override void DoImport(string assetPath, AssetImporter assetImporter, bool isFix)
+        {
+
+        }
+    }
+}

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Spine/BFSpineSubImporter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 95690334d8b9a8b4b82d428441cc2095
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceProcessConfig/ResourceProcessConfig.cs

@@ -133,6 +133,7 @@ namespace BFEditor.Resource
             new BFPrefabImporter(),
             new BFMaterialImporter(),
             new BFShaderImporter(),
+            new BFSpineImporter(),
         };
 
         //资源白名单 检查时过滤
@@ -201,6 +202,7 @@ namespace BFEditor.Resource
                 new BFAudioChecker(),
                 new BFMaterialChecker(),
                 new BFShaderChecker(),
+                new BFSpineChecker(),
             };
             return result;
         }

Assets/Editor/InspectorTools/EffectHelperInspector.cs

@@ -27,7 +27,7 @@ namespace BFEditor
 	        PrefabStage.prefabSaving += OnPrefabSaved;
 	    }
 
-	    private static void OnPrefabSaved(GameObject go)
+	    public static void OnPrefabSaved(GameObject go)
 	    {
 	        var effectHelper = go.GetComponent<EffectHelper>();
 	        if (effectHelper != null)

Assets/Editor/JenkinsAdapter.cs

@@ -61,8 +61,12 @@ public class JenkinsAdapter {
         PlayerSettings.bundleVersion = buildInfo.version;
         //Jenkins要求自动构建最低ios8.0
         PlayerSettings.iOS.targetOSVersionString = "12.0";
-        //设置Build为日期格式
+        //设置Build，每次需要增加
-        PlayerSettings.iOS.buildNumber = BuildVersion;
+        PlayerSettings.iOS.buildNumber = "2";
+        // 隐藏ios的横条
+        PlayerSettings.iOS.hideHomeButton = true;
+        // 禁止在所有边缘上延迟手势
+        PlayerSettings.iOS.deferSystemGesturesMode = UnityEngine.iOS.SystemGestureDeferMode.All;
 
         // 设置竖屏
         PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;

Assets/Editor/Utils/BFEditorUtils.cs

@@ -285,7 +285,7 @@ namespace BFEditor
             return string.Format("{0}分{1}秒", minus, second);
         }
 
-        public static List<string> GetAssetPathsWithSuffix(string path, string suffix)
+        public static List<string> GetAssetPathsWithSuffix(string path, string suffix, string containsStr = "")
         {
             var result = new List<string>();
             var fileInfos = new List<FileInfo>();
@@ -295,7 +295,17 @@ namespace BFEditor
             {
                 var resourcePath = "Assets" + fileInfos[i].FullName.Replace("\\", "/").Remove(0, Application.dataPath.Length);
                 resourcePath = resourcePath.Replace('\\', '/');
-                result.Add(resourcePath);
+                if (containsStr == "")
+                {
+                    result.Add(resourcePath);
+                }
+                else
+                {
+                    if (fileInfos[i].FullName.Contains(containsStr))
+                    {
+                        result.Add(resourcePath);
+                    }
+                }
             }
 
             return result;

Assets/Scripts/Common/BFMain.cs

@@ -17,6 +17,7 @@ namespace BF
         // 是否是单机版
         public static bool IsStandAlone = false;
         public static bool IsShenhe = false;
+        public static bool IsWhite = false;
         public static bool IsGotServerTime = false;
         public const string FILE_HEAD = "for_file_head";
         public const string FILE_HEAD_BASE64 = "Zm9yX2ZpbGVfaGVhZ";

Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs

@@ -27,6 +27,7 @@ namespace BF
         public void SetThinkingAnalyticsAccountId(string id)
         {
             TASdk.SetAccountId(id);
+            AFSdk.SetTaAccountId(id);
         }
 
         // 清除账户id

Assets/Scripts/Common/SDK/NativeCore/ThirdPlatform/AppsFlyerSdk.cs

@@ -9,7 +9,10 @@ namespace BF.NativeCore.ThirdPlatform
 	{
 		public void Init()
 		{
-        	// Debug.Log("AppsFlyerSdk Init version = " + AppsFlyer.getSdkVersion());
+			// 打通TA和AF的设置,要在AF初始化之前执行
+            var customData = new Dictionary<string, string>();
+			customData.Add("ta_distinct_id", ThinkingAnalyticsAPI.GetDistinctId());
+			AppsFlyer.setAdditionalData(customData);
 			AppsFlyer.setCustomerIdAndStartSDK(ThinkingAnalyticsAPI.GetDeviceId());
 		}
 
@@ -17,5 +20,13 @@ namespace BF.NativeCore.ThirdPlatform
 		{
 			AppsFlyer.sendEvent(eventName, properties);
 		}
+
+		public void SetTaAccountId(string accountId)
+		{
+			var customData = new Dictionary<string, string>();
+			customData.Add("ta_distinct_id", ThinkingAnalyticsAPI.GetDistinctId());
+			customData.Add("ta_account_id", accountId);
+			AppsFlyer.setAdditionalData(customData);
+		}
 	}
 }

Assets/Scripts/Common/SDK/NativeCore/ThirdPlatform/ThinkingAnalytics.cs

@@ -40,5 +40,10 @@ namespace BF.NativeCore.ThirdPlatform
         {
             ThinkingAnalyticsAPI.Track(eventName, properties, date, appId);
         }
+
+        public string GetDistinctId()
+        {
+            return ThinkingAnalyticsAPI.GetDistinctId();
+        }
     }
 }

Assets/XLua/Gen/BF_BFMainWrap.cs

@@ -47,7 +47,7 @@ namespace XLua.CSObjectWrap
 			Utils.EndObjectRegister(type, L, translator, null, null,
 			    null, null, null);
 
-		    Utils.BeginClassRegister(type, L, __CreateInstance, 6, 5, 5);
+		    Utils.BeginClassRegister(type, L, __CreateInstance, 6, 6, 6);
 			Utils.RegisterFunc(L, Utils.CLS_IDX, "SetServerTime", _m_SetServerTime_xlua_st_);
             Utils.RegisterFunc(L, Utils.CLS_IDX, "ForFree", _m_ForFree_xlua_st_);
             
@@ -58,12 +58,14 @@ namespace XLua.CSObjectWrap
             
 			Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsStandAlone", _g_get_IsStandAlone);
             Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsShenhe", _g_get_IsShenhe);
+            Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsWhite", _g_get_IsWhite);
             Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsGotServerTime", _g_get_IsGotServerTime);
             Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "ServerTime", _g_get_ServerTime);
             Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "DifferenceTime", _g_get_DifferenceTime);
             
 			Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsStandAlone", _s_set_IsStandAlone);
             Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsShenhe", _s_set_IsShenhe);
+            Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsWhite", _s_set_IsWhite);
             Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsGotServerTime", _s_set_IsGotServerTime);
             Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "ServerTime", _s_set_ServerTime);
             Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "DifferenceTime", _s_set_DifferenceTime);
@@ -428,6 +430,18 @@ namespace XLua.CSObjectWrap
             return 1;
         }
         
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _g_get_IsWhite(RealStatePtr L)
+        {
+		    try {
+            
+			    LuaAPI.lua_pushboolean(L, BF.BFMain.IsWhite);
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            return 1;
+        }
+        
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int _g_get_IsGotServerTime(RealStatePtr L)
         {
@@ -492,6 +506,19 @@ namespace XLua.CSObjectWrap
             return 0;
         }
         
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _s_set_IsWhite(RealStatePtr L)
+        {
+		    try {
+                
+			    BF.BFMain.IsWhite = LuaAPI.lua_toboolean(L, 1);
+            
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            return 0;
+        }
+        
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int _s_set_IsGotServerTime(RealStatePtr L)
         {

Assets/XLua/Gen/BF_NativeCore_ThirdPlatform_AppsFlyerSdkWrap.cs

@@ -21,10 +21,11 @@ namespace XLua.CSObjectWrap
         {
 			ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
 			System.Type type = typeof(BF.NativeCore.ThirdPlatform.AppsFlyerSdk);
-			Utils.BeginObjectRegister(type, L, translator, 0, 2, 0, 0);
+			Utils.BeginObjectRegister(type, L, translator, 0, 3, 0, 0);
 			
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendEvent", _m_SendEvent);
+			Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetTaAccountId", _m_SetTaAccountId);
 			
 			
 			
@@ -129,6 +130,34 @@ namespace XLua.CSObjectWrap
             
         }
         
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _m_SetTaAccountId(RealStatePtr L)
+        {
+		    try {
+            
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+            
+            
+                BF.NativeCore.ThirdPlatform.AppsFlyerSdk gen_to_be_invoked = (BF.NativeCore.ThirdPlatform.AppsFlyerSdk)translator.FastGetCSObj(L, 1);
+            
+            
+                
+                {
+                    string _accountId = LuaAPI.lua_tostring(L, 2);
+                    
+                    gen_to_be_invoked.SetTaAccountId( _accountId );
+                    
+                    
+                    
+                    return 0;
+                }
+                
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            
+        }
+        
         
         
         

Assets/XLua/Gen/BF_NativeCore_ThirdPlatform_ThinkingAnalyticsSdkWrap.cs

@@ -21,12 +21,13 @@ namespace XLua.CSObjectWrap
         {
 			ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
 			System.Type type = typeof(BF.NativeCore.ThirdPlatform.ThinkingAnalyticsSdk);
-			Utils.BeginObjectRegister(type, L, translator, 0, 4, 0, 0);
+			Utils.BeginObjectRegister(type, L, translator, 0, 5, 0, 0);
 			
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetAccountId", _m_SetAccountId);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "ClearAccountId", _m_ClearAccountId);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "Track", _m_Track);
+			Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetDistinctId", _m_GetDistinctId);
 			
 			
 			
@@ -227,6 +228,34 @@ namespace XLua.CSObjectWrap
             
         }
         
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _m_GetDistinctId(RealStatePtr L)
+        {
+		    try {
+            
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+            
+            
+                BF.NativeCore.ThirdPlatform.ThinkingAnalyticsSdk gen_to_be_invoked = (BF.NativeCore.ThirdPlatform.ThinkingAnalyticsSdk)translator.FastGetCSObj(L, 1);
+            
+            
+                
+                {
+                    
+                        var gen_ret = gen_to_be_invoked.GetDistinctId(  );
+                        LuaAPI.lua_pushstring(L, gen_ret);
+                    
+                    
+                    
+                    return 1;
+                }
+                
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            
+        }
+        
         
         
         

Assets/arts/spines/characters/m10011/m10011.atlas.txt

@@ -1,22 +0,0 @@
-m10011.png
-size:512,512
-filter:Linear,Linear
-hand
-bounds:111,313,56,53
-hand1
-bounds:56,209,51,41
-head
-bounds:2,252,107,114
-hit_yan3
-bounds:111,283,28,28
-leg01
-bounds:2,184,52,66
-spine
-bounds:304,374,115,102
-upperarm_l_01
-bounds:421,425,55,51
-upperarm_r_01
-bounds:2,127,55,51
-rotate:90
-weapon_1
-bounds:2,368,300,108

Assets/arts/spines/characters/m10066.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8a2b2c49153d0dc42942b18292c22e95
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/characters/m10066/m10066.atlas.txt

@@ -0,0 +1,56 @@
+m10066.png
+size:512,512
+filter:Linear,Linear
+er_01
+bounds:94,122,31,31
+er_02
+bounds:459,418,30,31
+eye_L
+bounds:127,212,21,18
+rotate:90
+eye_R
+bounds:345,362,21,17
+eye_xuanyun
+bounds:29,18,20,20
+hand_L_01
+bounds:29,40,42,34
+hand_R_01
+bounds:422,405,41,35
+rotate:90
+head
+bounds:2,155,123,78
+hit_yan3
+bounds:315,351,28,28
+leg_L
+bounds:375,392,45,54
+leg_R
+bounds:375,392,45,54
+mei_L
+bounds:147,237,33,21
+mei_R
+bounds:254,262,27,20
+spine
+bounds:2,235,143,116
+upperarm_L_01
+bounds:315,381,58,65
+upperarm_L_02
+bounds:254,284,67,48
+rotate:90
+upperarm_R_01
+bounds:457,451,59,47
+rotate:90
+upperarm_R_02
+bounds:29,112,63,41
+weapon_1
+bounds:2,353,311,157
+yaodai
+bounds:315,448,140,62
+yinying
+bounds:2,12,141,25
+rotate:90
+yuqi
+bounds:147,260,105,91
+zui_01
+bounds:29,2,24,14
+zui_02
+bounds:29,76,48,34

Assets/arts/spines/characters/m10066/m10066.atlas.txt.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: a6dd68d2abf87b949a5778efc932554d
+guid: d420a71f1c7707d42bd430a1841e5856
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10011.ab
+  assetBundleName: arts/spines/characters/m10066.ab
   assetBundleVariant: 

Assets/arts/spines/characters/m10066/m10066.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0ae7168b7b0ed104f8a8850caa683654
+guid: 02235a79ebfc3a54e88919e79eb6b212
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/characters/m10011.ab
+  assetBundleName: arts/spines/characters/m10066.ab
   assetBundleVariant: 

Assets/arts/spines/characters/m10066/m10066.skel.bytes.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: a6053e94050533f41a2cb4a4e031bd58
+guid: 466fcbb82d007664390f1d092c51a8f6
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10011.ab
+  assetBundleName: arts/spines/characters/m10066.ab
   assetBundleVariant: 

Assets/arts/spines/characters/m10066/m10066_atlas.asset

@@ -10,8 +10,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: m10011_atlas
+  m_Name: m10066_atlas
   m_EditorClassIdentifier: 
-  atlasFile: {fileID: 4900000, guid: a6053e94050533f41a2cb4a4e031bd58, type: 3}
+  atlasFile: {fileID: 4900000, guid: d420a71f1c7707d42bd430a1841e5856, type: 3}
   materials:
-  - {fileID: 2100000, guid: 8a7a1e2fb970e8f44b84096d44af8c92, type: 2}
+  - {fileID: 2100000, guid: b90d40887916acf42b9994d6e0d219c3, type: 2}

Assets/arts/spines/characters/m10066/m10066_atlas.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 57032383fbfe6f345a76dd407b32affe
+guid: dda2cf255f9f65e418c5746f177733c2
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10011.ab
+  assetBundleName: arts/spines/characters/m10066.ab
   assetBundleVariant: 

Assets/arts/spines/characters/m10066/m10066_material.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: m10011_material
+  m_Name: m10066_material
   m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
   m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 4
@@ -20,7 +20,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 0ae7168b7b0ed104f8a8850caa683654, type: 3}
+        m_Texture: {fileID: 2800000, guid: 02235a79ebfc3a54e88919e79eb6b212, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:

Assets/arts/spines/characters/m10066/m10066_material.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 8a7a1e2fb970e8f44b84096d44af8c92
+guid: b90d40887916acf42b9994d6e0d219c3
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/characters/m10011.ab
+  assetBundleName: arts/spines/characters/m10066.ab
   assetBundleVariant: 

Assets/arts/spines/characters/m10066/m10066_skeletondata.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: m10011_skeletondata
+  m_Name: m10066_skeletondata
   m_EditorClassIdentifier: 
   atlasAssets:
-  - {fileID: 11400000, guid: de0cd0883565eec4b823470f30a82807, type: 2}
+  - {fileID: 11400000, guid: dda2cf255f9f65e418c5746f177733c2, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: a6dd68d2abf87b949a5778efc932554d, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 466fcbb82d007664390f1d092c51a8f6, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0

Assets/arts/spines/characters/m10066/m10066_skeletondata.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: de0cd0883565eec4b823470f30a82807
+guid: fe4199b03db04c146bc9fbda32dabcfd
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10011.ab
+  assetBundleName: arts/spines/characters/m10066.ab
   assetBundleVariant: 

Assets/arts/spines/characters/m10067.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1a8628b0281f87e4e95da2eb804d4228
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/characters/m10067/m10067.atlas.txt

@@ -0,0 +1,46 @@
+m10067.png
+size:512,512
+filter:Linear,Linear
+eye_L
+bounds:487,491,23,19
+eye_R
+bounds:2,109,16,18
+eye_xuanyun
+bounds:32,167,20,20
+gutou
+bounds:89,230,70,53
+rotate:90
+head
+bounds:2,302,140,94
+hit_yan2
+bounds:144,334,20,20
+hit_yan3
+bounds:2,129,28,28
+kulou
+bounds:315,421,77,62
+offsets:0,1,77,63
+leg_01
+bounds:144,356,38,40
+leg_04
+bounds:144,356,38,40
+leg_02
+bounds:394,434,49,49
+leg_03
+bounds:89,179,49,49
+qi
+bounds:180,423,133,87
+shetou
+bounds:2,159,141,28
+rotate:90
+spine
+bounds:2,398,176,112
+ya_01
+bounds:180,399,18,22
+ya_02
+bounds:458,486,24,27
+rotate:90
+yinying
+bounds:315,485,141,25
+zui_01
+bounds:32,189,111,55
+rotate:90

Assets/arts/spines/characters/m10067/m10067.atlas.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fdc6790c6d26140499af658c115ed56c
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: arts/spines/characters/m10067.ab
+  assetBundleVariant: 

Assets/arts/spines/characters/m10067/m10067.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 03a34e8817bdcfb4bbe6f981aa4c4ac5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: arts/spines/characters/m10067.ab
+  assetBundleVariant: 

Assets/arts/spines/characters/m10067/m10067.skel.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: be4493aaeea628345be2625d2c842dd7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: arts/spines/characters/m10067.ab
+  assetBundleVariant: 

Assets/arts/spines/characters/m10067/m10067_atlas.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
+  m_Name: m10067_atlas
+  m_EditorClassIdentifier: 
+  atlasFile: {fileID: 4900000, guid: fdc6790c6d26140499af658c115ed56c, type: 3}
+  materials:
+  - {fileID: 2100000, guid: aa2da29680bba9941afd5ed6adf65bbd, type: 2}

Assets/arts/spines/characters/m10067/m10067_atlas.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ecc79c04dc9ed434f8d9190fc6b1c042
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: arts/spines/characters/m10067.ab
+  assetBundleVariant: 

Assets/arts/spines/characters/m10067/m10067_material.mat

@@ -0,0 +1,40 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: m10067_material
+  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 03a34e8817bdcfb4bbe6f981aa4c4ac5, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 1
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/arts/spines/characters/m10067/m10067_material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa2da29680bba9941afd5ed6adf65bbd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: arts/spines/characters/m10067.ab
+  assetBundleVariant: 

Assets/arts/spines/characters/m10067/m10067_skeletondata.asset

@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
+  m_Name: m10067_skeletondata
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: ecc79c04dc9ed434f8d9190fc6b1c042, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: be4493aaeea628345be2625d2c842dd7, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 0
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0.2
+  controller: {fileID: 0}

Assets/arts/spines/characters/m10067/m10067_skeletondata.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e746e21982782894693c3e1a79d4b44a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: arts/spines/characters/m10067.ab
+  assetBundleVariant: 

Assets/arts/spines/characters/m20033/m20033_skeletondata.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m20033.ab
   assetBundleVariant: 

Assets/prefabs/effects/battle/sfx_m10001_b01.prefab

@@ -4891,7 +4891,7 @@ GameObject:
   - component: {fileID: 3969050598904396665}
   - component: {fileID: 5797749686316629692}
   - component: {fileID: 7524761677410823863}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: sfx_m10001_b01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -19502,7 +19502,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8152317414847926131}
   - component: {fileID: 6549108432977052272}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: sfx_m10001_b01
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/prefabs/effects/battle/sfx_m10001_b02.prefab

@@ -4926,7 +4926,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2808243400270546253}
   - component: {fileID: 2728628357642656599}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: sfx_m10001_b02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -14746,7 +14746,7 @@ GameObject:
   - component: {fileID: 6975756402605470023}
   - component: {fileID: 553808199925576834}
   - component: {fileID: 4591254756495762569}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: sfx_m10001_b02
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/prefabs/effects/battle/sfx_m10001_b03.prefab

@@ -4891,7 +4891,7 @@ GameObject:
   - component: {fileID: 2447393329790331273}
   - component: {fileID: 5086740628619373644}
   - component: {fileID: 9119604360729607239}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: sfx_m10001_b03
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -14613,7 +14613,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7476217580627336579}
   - component: {fileID: 1077116519815033091}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: sfx_m10001_b03
   m_TagString: Untagged
   m_Icon: {fileID: 0}