diff --git a/Assets/Editor/LuaGenConfig.cs b/Assets/Editor/LuaGenConfig.cs index adaf29d6b..740644436 100644 --- a/Assets/Editor/LuaGenConfig.cs +++ b/Assets/Editor/LuaGenConfig.cs @@ -452,6 +452,8 @@ namespace BFEditor typeof(BF.ScrollRectBaseOld.ScrollbarVisibility), typeof(BF.NetServiceType), typeof(BF.NetIncomingMessageType), + typeof(BF.BFGridLayout.Corner), + typeof(BF.BFGridLayout.Constraint), }; return unityTypes.Concat(customTypes).Concat(otherTypes); } diff --git a/Assets/XLua/Gen/BF_BFGridLayoutWrap.cs b/Assets/XLua/Gen/BF_BFGridLayoutWrap.cs index b3b735d93..9f6fa0369 100644 --- a/Assets/XLua/Gen/BF_BFGridLayoutWrap.cs +++ b/Assets/XLua/Gen/BF_BFGridLayoutWrap.cs @@ -205,7 +205,7 @@ namespace XLua.CSObjectWrap ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); BF.BFGridLayout gen_to_be_invoked = (BF.BFGridLayout)translator.FastGetCSObj(L, 1); - translator.Push(L, gen_to_be_invoked.StartCorner); + translator.PushBFBFGridLayoutCorner(L, gen_to_be_invoked.StartCorner); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -219,7 +219,7 @@ namespace XLua.CSObjectWrap ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); BF.BFGridLayout gen_to_be_invoked = (BF.BFGridLayout)translator.FastGetCSObj(L, 1); - translator.Push(L, gen_to_be_invoked.ConstraintType); + translator.PushBFBFGridLayoutConstraint(L, gen_to_be_invoked.ConstraintType); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } diff --git a/Assets/XLua/Gen/EnumWrap.cs b/Assets/XLua/Gen/EnumWrap.cs index 664ff1cb9..7f909c92c 100644 --- a/Assets/XLua/Gen/EnumWrap.cs +++ b/Assets/XLua/Gen/EnumWrap.cs @@ -5442,4 +5442,138 @@ namespace XLua.CSObjectWrap } } + public class BFBFGridLayoutCornerWrap + { + public static void __Register(RealStatePtr L) + { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + Utils.BeginObjectRegister(typeof(BF.BFGridLayout.Corner), L, translator, 0, 0, 0, 0); + Utils.EndObjectRegister(typeof(BF.BFGridLayout.Corner), L, translator, null, null, null, null, null); + + Utils.BeginClassRegister(typeof(BF.BFGridLayout.Corner), L, null, 5, 0, 0); + + + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "UpperLeft", BF.BFGridLayout.Corner.UpperLeft); + + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "UpperRight", BF.BFGridLayout.Corner.UpperRight); + + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "LowerLeft", BF.BFGridLayout.Corner.LowerLeft); + + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "LowerRight", BF.BFGridLayout.Corner.LowerRight); + + + Utils.RegisterFunc(L, Utils.CLS_IDX, "__CastFrom", __CastFrom); + + Utils.EndClassRegister(typeof(BF.BFGridLayout.Corner), L, translator); + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int __CastFrom(RealStatePtr L) + { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + LuaTypes lua_type = LuaAPI.lua_type(L, 1); + if (lua_type == LuaTypes.LUA_TNUMBER) + { + translator.PushBFBFGridLayoutCorner(L, (BF.BFGridLayout.Corner)LuaAPI.xlua_tointeger(L, 1)); + } + + else if(lua_type == LuaTypes.LUA_TSTRING) + { + + if (LuaAPI.xlua_is_eq_str(L, 1, "UpperLeft")) + { + translator.PushBFBFGridLayoutCorner(L, BF.BFGridLayout.Corner.UpperLeft); + } + else if (LuaAPI.xlua_is_eq_str(L, 1, "UpperRight")) + { + translator.PushBFBFGridLayoutCorner(L, BF.BFGridLayout.Corner.UpperRight); + } + else if (LuaAPI.xlua_is_eq_str(L, 1, "LowerLeft")) + { + translator.PushBFBFGridLayoutCorner(L, BF.BFGridLayout.Corner.LowerLeft); + } + else if (LuaAPI.xlua_is_eq_str(L, 1, "LowerRight")) + { + translator.PushBFBFGridLayoutCorner(L, BF.BFGridLayout.Corner.LowerRight); + } + else + { + return LuaAPI.luaL_error(L, "invalid string for BF.BFGridLayout.Corner!"); + } + + } + + else + { + return LuaAPI.luaL_error(L, "invalid lua type for BF.BFGridLayout.Corner! Expect number or string, got + " + lua_type); + } + + return 1; + } + } + + public class BFBFGridLayoutConstraintWrap + { + public static void __Register(RealStatePtr L) + { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + Utils.BeginObjectRegister(typeof(BF.BFGridLayout.Constraint), L, translator, 0, 0, 0, 0); + Utils.EndObjectRegister(typeof(BF.BFGridLayout.Constraint), L, translator, null, null, null, null, null); + + Utils.BeginClassRegister(typeof(BF.BFGridLayout.Constraint), L, null, 4, 0, 0); + + + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "Flexible", BF.BFGridLayout.Constraint.Flexible); + + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "FixedColumnCount", BF.BFGridLayout.Constraint.FixedColumnCount); + + Utils.RegisterObject(L, translator, Utils.CLS_IDX, "FixedRowCount", BF.BFGridLayout.Constraint.FixedRowCount); + + + Utils.RegisterFunc(L, Utils.CLS_IDX, "__CastFrom", __CastFrom); + + Utils.EndClassRegister(typeof(BF.BFGridLayout.Constraint), L, translator); + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int __CastFrom(RealStatePtr L) + { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + LuaTypes lua_type = LuaAPI.lua_type(L, 1); + if (lua_type == LuaTypes.LUA_TNUMBER) + { + translator.PushBFBFGridLayoutConstraint(L, (BF.BFGridLayout.Constraint)LuaAPI.xlua_tointeger(L, 1)); + } + + else if(lua_type == LuaTypes.LUA_TSTRING) + { + + if (LuaAPI.xlua_is_eq_str(L, 1, "Flexible")) + { + translator.PushBFBFGridLayoutConstraint(L, BF.BFGridLayout.Constraint.Flexible); + } + else if (LuaAPI.xlua_is_eq_str(L, 1, "FixedColumnCount")) + { + translator.PushBFBFGridLayoutConstraint(L, BF.BFGridLayout.Constraint.FixedColumnCount); + } + else if (LuaAPI.xlua_is_eq_str(L, 1, "FixedRowCount")) + { + translator.PushBFBFGridLayoutConstraint(L, BF.BFGridLayout.Constraint.FixedRowCount); + } + else + { + return LuaAPI.luaL_error(L, "invalid string for BF.BFGridLayout.Constraint!"); + } + + } + + else + { + return LuaAPI.luaL_error(L, "invalid lua type for BF.BFGridLayout.Constraint! Expect number or string, got + " + lua_type); + } + + return 1; + } + } + } \ No newline at end of file diff --git a/Assets/XLua/Gen/WrapPusher.cs b/Assets/XLua/Gen/WrapPusher.cs index 2b82e4d96..bb5ec3755 100644 --- a/Assets/XLua/Gen/WrapPusher.cs +++ b/Assets/XLua/Gen/WrapPusher.cs @@ -110,6 +110,8 @@ namespace XLua translator.RegisterPushAndGetAndUpdate(translator.PushBFScrollRectBaseOldScrollbarVisibility, translator.Get, translator.UpdateBFScrollRectBaseOldScrollbarVisibility); translator.RegisterPushAndGetAndUpdate(translator.PushBFNetServiceType, translator.Get, translator.UpdateBFNetServiceType); translator.RegisterPushAndGetAndUpdate(translator.PushBFNetIncomingMessageType, translator.Get, translator.UpdateBFNetIncomingMessageType); + translator.RegisterPushAndGetAndUpdate(translator.PushBFBFGridLayoutCorner, translator.Get, translator.UpdateBFBFGridLayoutCorner); + translator.RegisterPushAndGetAndUpdate(translator.PushBFBFGridLayoutConstraint, translator.Get, translator.UpdateBFBFGridLayoutConstraint); } } @@ -7030,6 +7032,174 @@ namespace XLua } } + int BFBFGridLayoutCorner_TypeID = -1; + int BFBFGridLayoutCorner_EnumRef = -1; + + public void PushBFBFGridLayoutCorner(RealStatePtr L, BF.BFGridLayout.Corner val) + { + if (BFBFGridLayoutCorner_TypeID == -1) + { + bool is_first; + BFBFGridLayoutCorner_TypeID = getTypeId(L, typeof(BF.BFGridLayout.Corner), out is_first); + + if (BFBFGridLayoutCorner_EnumRef == -1) + { + Utils.LoadCSTable(L, typeof(BF.BFGridLayout.Corner)); + BFBFGridLayoutCorner_EnumRef = LuaAPI.luaL_ref(L, LuaIndexes.LUA_REGISTRYINDEX); + } + + } + + if (LuaAPI.xlua_tryget_cachedud(L, (int)val, BFBFGridLayoutCorner_EnumRef) == 1) + { + return; + } + + IntPtr buff = LuaAPI.xlua_pushstruct(L, 4, BFBFGridLayoutCorner_TypeID); + if (!CopyByValue.Pack(buff, 0, (int)val)) + { + throw new Exception("pack fail fail for BF.BFGridLayout.Corner ,value="+val); + } + + LuaAPI.lua_getref(L, BFBFGridLayoutCorner_EnumRef); + LuaAPI.lua_pushvalue(L, -2); + LuaAPI.xlua_rawseti(L, -2, (int)val); + LuaAPI.lua_pop(L, 1); + + } + + public void Get(RealStatePtr L, int index, out BF.BFGridLayout.Corner val) + { + LuaTypes type = LuaAPI.lua_type(L, index); + if (type == LuaTypes.LUA_TUSERDATA ) + { + if (LuaAPI.xlua_gettypeid(L, index) != BFBFGridLayoutCorner_TypeID) + { + throw new Exception("invalid userdata for BF.BFGridLayout.Corner"); + } + + IntPtr buff = LuaAPI.lua_touserdata(L, index); + int e; + if (!CopyByValue.UnPack(buff, 0, out e)) + { + throw new Exception("unpack fail for BF.BFGridLayout.Corner"); + } + val = (BF.BFGridLayout.Corner)e; + + } + else + { + val = (BF.BFGridLayout.Corner)objectCasters.GetCaster(typeof(BF.BFGridLayout.Corner))(L, index, null); + } + } + + public void UpdateBFBFGridLayoutCorner(RealStatePtr L, int index, BF.BFGridLayout.Corner val) + { + + if (LuaAPI.lua_type(L, index) == LuaTypes.LUA_TUSERDATA) + { + if (LuaAPI.xlua_gettypeid(L, index) != BFBFGridLayoutCorner_TypeID) + { + throw new Exception("invalid userdata for BF.BFGridLayout.Corner"); + } + + IntPtr buff = LuaAPI.lua_touserdata(L, index); + if (!CopyByValue.Pack(buff, 0, (int)val)) + { + throw new Exception("pack fail for BF.BFGridLayout.Corner ,value="+val); + } + } + + else + { + throw new Exception("try to update a data with lua type:" + LuaAPI.lua_type(L, index)); + } + } + + int BFBFGridLayoutConstraint_TypeID = -1; + int BFBFGridLayoutConstraint_EnumRef = -1; + + public void PushBFBFGridLayoutConstraint(RealStatePtr L, BF.BFGridLayout.Constraint val) + { + if (BFBFGridLayoutConstraint_TypeID == -1) + { + bool is_first; + BFBFGridLayoutConstraint_TypeID = getTypeId(L, typeof(BF.BFGridLayout.Constraint), out is_first); + + if (BFBFGridLayoutConstraint_EnumRef == -1) + { + Utils.LoadCSTable(L, typeof(BF.BFGridLayout.Constraint)); + BFBFGridLayoutConstraint_EnumRef = LuaAPI.luaL_ref(L, LuaIndexes.LUA_REGISTRYINDEX); + } + + } + + if (LuaAPI.xlua_tryget_cachedud(L, (int)val, BFBFGridLayoutConstraint_EnumRef) == 1) + { + return; + } + + IntPtr buff = LuaAPI.xlua_pushstruct(L, 4, BFBFGridLayoutConstraint_TypeID); + if (!CopyByValue.Pack(buff, 0, (int)val)) + { + throw new Exception("pack fail fail for BF.BFGridLayout.Constraint ,value="+val); + } + + LuaAPI.lua_getref(L, BFBFGridLayoutConstraint_EnumRef); + LuaAPI.lua_pushvalue(L, -2); + LuaAPI.xlua_rawseti(L, -2, (int)val); + LuaAPI.lua_pop(L, 1); + + } + + public void Get(RealStatePtr L, int index, out BF.BFGridLayout.Constraint val) + { + LuaTypes type = LuaAPI.lua_type(L, index); + if (type == LuaTypes.LUA_TUSERDATA ) + { + if (LuaAPI.xlua_gettypeid(L, index) != BFBFGridLayoutConstraint_TypeID) + { + throw new Exception("invalid userdata for BF.BFGridLayout.Constraint"); + } + + IntPtr buff = LuaAPI.lua_touserdata(L, index); + int e; + if (!CopyByValue.UnPack(buff, 0, out e)) + { + throw new Exception("unpack fail for BF.BFGridLayout.Constraint"); + } + val = (BF.BFGridLayout.Constraint)e; + + } + else + { + val = (BF.BFGridLayout.Constraint)objectCasters.GetCaster(typeof(BF.BFGridLayout.Constraint))(L, index, null); + } + } + + public void UpdateBFBFGridLayoutConstraint(RealStatePtr L, int index, BF.BFGridLayout.Constraint val) + { + + if (LuaAPI.lua_type(L, index) == LuaTypes.LUA_TUSERDATA) + { + if (LuaAPI.xlua_gettypeid(L, index) != BFBFGridLayoutConstraint_TypeID) + { + throw new Exception("invalid userdata for BF.BFGridLayout.Constraint"); + } + + IntPtr buff = LuaAPI.lua_touserdata(L, index); + if (!CopyByValue.Pack(buff, 0, (int)val)) + { + throw new Exception("pack fail for BF.BFGridLayout.Constraint ,value="+val); + } + } + + else + { + throw new Exception("try to update a data with lua type:" + LuaAPI.lua_type(L, index)); + } + } + // table cast optimze @@ -7545,6 +7715,18 @@ namespace XLua translator.PushBFNetIncomingMessageType(L, array[index]); return true; } + else if (type == typeof(BF.BFGridLayout.Corner[])) + { + BF.BFGridLayout.Corner[] array = obj as BF.BFGridLayout.Corner[]; + translator.PushBFBFGridLayoutCorner(L, array[index]); + return true; + } + else if (type == typeof(BF.BFGridLayout.Constraint[])) + { + BF.BFGridLayout.Constraint[] array = obj as BF.BFGridLayout.Constraint[]; + translator.PushBFBFGridLayoutConstraint(L, array[index]); + return true; + } return false; } @@ -8055,6 +8237,18 @@ namespace XLua translator.Get(L, obj_idx, out array[array_idx]); return true; } + else if (type == typeof(BF.BFGridLayout.Corner[])) + { + BF.BFGridLayout.Corner[] array = obj as BF.BFGridLayout.Corner[]; + translator.Get(L, obj_idx, out array[array_idx]); + return true; + } + else if (type == typeof(BF.BFGridLayout.Constraint[])) + { + BF.BFGridLayout.Constraint[] array = obj as BF.BFGridLayout.Constraint[]; + translator.Get(L, obj_idx, out array[array_idx]); + return true; + } return false; } } diff --git a/Assets/XLua/Gen/XLuaGenAutoRegister.cs b/Assets/XLua/Gen/XLuaGenAutoRegister.cs index 9a89bca8e..c01ff7616 100644 --- a/Assets/XLua/Gen/XLuaGenAutoRegister.cs +++ b/Assets/XLua/Gen/XLuaGenAutoRegister.cs @@ -3047,6 +3047,12 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(BF.NetIncomingMessageType), BFNetIncomingMessageTypeWrap.__Register); + translator.DelayWrapLoader(typeof(BF.BFGridLayout.Corner), BFBFGridLayoutCornerWrap.__Register); + + + translator.DelayWrapLoader(typeof(BF.BFGridLayout.Constraint), BFBFGridLayoutConstraintWrap.__Register); + + } diff --git a/Assets/XLua/Gen/link.xml b/Assets/XLua/Gen/link.xml index c8006180a..487ec2815 100644 --- a/Assets/XLua/Gen/link.xml +++ b/Assets/XLua/Gen/link.xml @@ -316,6 +316,8 @@ + + diff --git a/Assets/arts/atlas/ui/bounty.asset b/Assets/arts/atlas/ui/bounty.asset index 4680d553e..7b2947837 100644 --- a/Assets/arts/atlas/ui/bounty.asset +++ b/Assets/arts/atlas/ui/bounty.asset @@ -20,6 +20,11 @@ MonoBehaviour: - {fileID: 21300000, guid: 2af436c80c32cb046bb90c11245ea4ed, type: 3} - {fileID: 21300000, guid: d3aa1d33a76ef724092054945d8d0dae, type: 3} - {fileID: 21300000, guid: 4393de5389e82684c9f54914198f42f9, type: 3} + - {fileID: 21300000, guid: a388551653fe1a44f82f1e084eab8c93, type: 3} + - {fileID: 21300000, guid: 731113889e14bf44a83563cf5c303077, type: 3} + - {fileID: 21300000, guid: db2a9231ef00a9a49a5920a818c08e47, type: 3} + - {fileID: 21300000, guid: 8c92742a7afdf6b46881adea0c4b5846, type: 3} + - {fileID: 21300000, guid: 461a20dd07e8e3e4ca49d2ec52b47f0b, type: 3} - {fileID: 21300000, guid: b1af5501d58b0f644bb5be24c48d945e, type: 3} - {fileID: 21300000, guid: 175b37d7c69fd6949a2e4a0a4341637f, type: 3} - {fileID: 21300000, guid: 9363ca013a7b55e4e97c21d9c76c106b, type: 3} @@ -31,4 +36,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 48896080b277b7347afc80414a9b0e04, type: 3} - {fileID: 21300000, guid: ada861ca87f0269478847b6c463e77ec, type: 3} - {fileID: 21300000, guid: 6767eb4bb7d152447bb08b909b34c239, type: 3} - spriteNameList: cb8da21dcc8da21d849d74b5859d74b5869d74b5813ae87b823ae87ba086ca96a186ca96a286ca96a386ca96a486ca96a586ca96ba8c6a50bb8c6a50bc8c6a50b3ca3bc71033235c + spriteNameList: cb8da21dcc8da21d849d74b5859d74b5869d74b5813ae87b823ae87bdffaa1dee0faa1dee1faa1dee2faa1dee3faa1dea086ca96a186ca96a286ca96a386ca96a486ca96a586ca96ba8c6a50bb8c6a50bc8c6a50b3ca3bc71033235c diff --git a/Assets/arts/atlas/ui/bounty.spriteatlas b/Assets/arts/atlas/ui/bounty.spriteatlas index 8f38b773d..0f98e70f2 100644 --- a/Assets/arts/atlas/ui/bounty.spriteatlas +++ b/Assets/arts/atlas/ui/bounty.spriteatlas @@ -65,38 +65,48 @@ SpriteAtlas: - {fileID: 21300000, guid: 48896080b277b7347afc80414a9b0e04, type: 3} - {fileID: 21300000, guid: b1af5501d58b0f644bb5be24c48d945e, type: 3} - {fileID: 21300000, guid: 9363ca013a7b55e4e97c21d9c76c106b, type: 3} + - {fileID: 21300000, guid: db2a9231ef00a9a49a5920a818c08e47, type: 3} - {fileID: 21300000, guid: d3aa1d33a76ef724092054945d8d0dae, type: 3} - {fileID: 21300000, guid: 4393de5389e82684c9f54914198f42f9, type: 3} - {fileID: 21300000, guid: 38e2716343d274e4e936c8f1cd4f04cd, type: 3} + - {fileID: 21300000, guid: a388551653fe1a44f82f1e084eab8c93, type: 3} - {fileID: 21300000, guid: 129dd3d736ed34c4fad5b31566a74c30, type: 3} - {fileID: 21300000, guid: 175b37d7c69fd6949a2e4a0a4341637f, type: 3} + - {fileID: 21300000, guid: 731113889e14bf44a83563cf5c303077, type: 3} - {fileID: 21300000, guid: 2af436c80c32cb046bb90c11245ea4ed, type: 3} - {fileID: 21300000, guid: 4e4e9cc80d2948847b3f4b7b148a552e, type: 3} + - {fileID: 21300000, guid: 8c92742a7afdf6b46881adea0c4b5846, type: 3} - {fileID: 21300000, guid: ada861ca87f0269478847b6c463e77ec, type: 3} - {fileID: 21300000, guid: 6b4c13fa6c8a1074e936610079fb615f, type: 3} - {fileID: 21300000, guid: 6767eb4bb7d152447bb08b909b34c239, type: 3} - {fileID: 21300000, guid: cd95e95c8e43f3448ae79f4d57256d3a, type: 3} - {fileID: 21300000, guid: 53718e7d402adb34c9303187c20ee358, type: 3} - {fileID: 21300000, guid: cd61c99d1fb3ae740b3f5a7399d51969, type: 3} + - {fileID: 21300000, guid: 461a20dd07e8e3e4ca49d2ec52b47f0b, type: 3} - {fileID: 21300000, guid: 3f41bb7e064d25847928226fa42467f5, type: 3} m_PackedSpriteNamesToIndex: - bounty_dec_6 - bounty_line_3 - bounty_dec_1 - bounty_dec_3 + - bounty_chest_3 - bounty_btn_main_0 - bounty_btn_main_1 - bounty_bg_1 + - bounty_chest_1 - bounty_board_1 - bounty_dec_2 + - bounty_chest_2 - bounty_board_3 - bounty_board_2 + - bounty_chest_4 - bounty_progress_1 - bounty_dec_5 - bounty_select - bounty_dec_4 - bounty_line_1 - bounty_bg_2 + - bounty_chest_5 - bounty_line_2 m_RenderDataMap: {} m_Tag: bounty diff --git a/Assets/arts/atlas/ui/main.spriteatlas b/Assets/arts/atlas/ui/main.spriteatlas index 1ff9d2239..f5a9ad243 100644 --- a/Assets/arts/atlas/ui/main.spriteatlas +++ b/Assets/arts/atlas/ui/main.spriteatlas @@ -72,7 +72,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 64f989e8b40a3fc4ea138aa6d314d7be, type: 3} - {fileID: 21300000, guid: 97c8eba9132d32246ae08c3cbc05c7cb, type: 3} - {fileID: 21300000, guid: 6a471cbadff649e429c3ca4a54c0fd4b, type: 3} - - {fileID: 21300000, guid: 5962af8bc86575c459b454d2266f805a, type: 3} - {fileID: 21300000, guid: a11d2ecba6359b7449faa1c86929e65b, type: 3} - {fileID: 21300000, guid: d5338fcb9468f5d4fb50f0b3cb68be90, type: 3} - {fileID: 21300000, guid: ac95da3d35af16f42a23be26f95d5242, type: 3} @@ -92,7 +91,6 @@ SpriteAtlas: - main_dec_4 - main_dec_2 - main_bg_1 - - main_btn_fund - main_btn_pig - main_btn_mail - main_btn_task diff --git a/Assets/arts/effects/texture/glow/eff_lzj_056.png.meta b/Assets/arts/effects/texture/glow/eff_lzj_056.png.meta index 074335ceb..c668c6eb9 100644 --- a/Assets/arts/effects/texture/glow/eff_lzj_056.png.meta +++ b/Assets/arts/effects/texture/glow/eff_lzj_056.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 219fbb7d9366f3e4d8fe00a7135316ce TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: 47 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 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: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/glow/light_yjs_0056_b05.png.meta b/Assets/arts/effects/texture/glow/light_yjs_0056_b05.png.meta index 2929b5477..432b4e482 100644 --- a/Assets/arts/effects/texture/glow/light_yjs_0056_b05.png.meta +++ b/Assets/arts/effects/texture/glow/light_yjs_0056_b05.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: 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: [] diff --git a/Assets/arts/effects/texture/noise/noise_dzh_0049.png.meta b/Assets/arts/effects/texture/noise/noise_dzh_0049.png.meta index 551be241d..566caa028 100644 --- a/Assets/arts/effects/texture/noise/noise_dzh_0049.png.meta +++ b/Assets/arts/effects/texture/noise/noise_dzh_0049.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: 440369d6962334f42889676420a91b30 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + 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: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/other/fx_bingzhui_b01.png.meta b/Assets/arts/effects/texture/other/fx_bingzhui_b01.png.meta index 2e34290ca..95d6bc948 100644 --- a/Assets/arts/effects/texture/other/fx_bingzhui_b01.png.meta +++ b/Assets/arts/effects/texture/other/fx_bingzhui_b01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: 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: [] diff --git a/Assets/arts/effects/texture/other/huaban_df_0001.png.meta b/Assets/arts/effects/texture/other/huaban_df_0001.png.meta index 28f0f9b8d..ffbdd5ba6 100644 --- a/Assets/arts/effects/texture/other/huaban_df_0001.png.meta +++ b/Assets/arts/effects/texture/other/huaban_df_0001.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: 469f16159a19b4c4d8fb5bede328f59c TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 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 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + 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: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/other/other_dzh_0015_b01.png.meta b/Assets/arts/effects/texture/other/other_dzh_0015_b01.png.meta index 94df4dc6a..08b3cfcf0 100644 --- a/Assets/arts/effects/texture/other/other_dzh_0015_b01.png.meta +++ b/Assets/arts/effects/texture/other/other_dzh_0015_b01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: 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: [] diff --git a/Assets/arts/effects/texture/other/smoke_lyy_0008_t.png.meta b/Assets/arts/effects/texture/other/smoke_lyy_0008_t.png.meta index d68d3d88f..a2d6de471 100644 --- a/Assets/arts/effects/texture/other/smoke_lyy_0008_t.png.meta +++ b/Assets/arts/effects/texture/other/smoke_lyy_0008_t.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: 31584ad03cc7a6f42934ce8950a92f5b TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 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 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + 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: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/other/smoke_txy_0031_b01.png.meta b/Assets/arts/effects/texture/other/smoke_txy_0031_b01.png.meta index 61c404980..e68661933 100644 --- a/Assets/arts/effects/texture/other/smoke_txy_0031_b01.png.meta +++ b/Assets/arts/effects/texture/other/smoke_txy_0031_b01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: 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: [] diff --git a/Assets/arts/effects/texture/other/spark_df_0018_04.png.meta b/Assets/arts/effects/texture/other/spark_df_0018_04.png.meta index c3169aced..2744933a9 100644 --- a/Assets/arts/effects/texture/other/spark_df_0018_04.png.meta +++ b/Assets/arts/effects/texture/other/spark_df_0018_04.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: cc8fffbf99d0296428b2334c6efc817f TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + 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: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/other/spark_tom_0002_b01.tga.meta b/Assets/arts/effects/texture/other/spark_tom_0002_b01.tga.meta index 224536cd4..39e62d44c 100644 --- a/Assets/arts/effects/texture/other/spark_tom_0002_b01.tga.meta +++ b/Assets/arts/effects/texture/other/spark_tom_0002_b01.tga.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -75,6 +75,30 @@ TextureImporter: 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: [] diff --git a/Assets/arts/effects/texture/other/yumao.png.meta b/Assets/arts/effects/texture/other/yumao.png.meta index b4a413adb..76bace549 100644 --- a/Assets/arts/effects/texture/other/yumao.png.meta +++ b/Assets/arts/effects/texture/other/yumao.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/spines/characters/m20023/m20023.atlas.txt.meta b/Assets/arts/spines/characters/m20023/m20023.atlas.txt.meta index a3627a9bb..b016331ea 100644 --- a/Assets/arts/spines/characters/m20023/m20023.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20023/m20023.atlas.txt.meta @@ -3,5 +3,5 @@ guid: d834fc5970a23fd43a7a839a11a33c7e TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20023/m20023.png.meta b/Assets/arts/spines/characters/m20023/m20023.png.meta index f18408d6f..c64dd0c2b 100644 --- a/Assets/arts/spines/characters/m20023/m20023.png.meta +++ b/Assets/arts/spines/characters/m20023/m20023.png.meta @@ -116,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20023/m20023.skel.bytes b/Assets/arts/spines/characters/m20023/m20023.skel.bytes index b36281675..7213936e7 100644 Binary files a/Assets/arts/spines/characters/m20023/m20023.skel.bytes and b/Assets/arts/spines/characters/m20023/m20023.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20023/m20023.skel.bytes.meta b/Assets/arts/spines/characters/m20023/m20023.skel.bytes.meta index 1bd6816c0..efd8d86a1 100644 --- a/Assets/arts/spines/characters/m20023/m20023.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20023/m20023.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 7eaa7186d33ce9845b79de98fccacb92 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20023/m20023_atlas.asset.meta b/Assets/arts/spines/characters/m20023/m20023_atlas.asset.meta index e1f5e28a8..cae23e550 100644 --- a/Assets/arts/spines/characters/m20023/m20023_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20023/m20023_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20023/m20023_material.mat.meta b/Assets/arts/spines/characters/m20023/m20023_material.mat.meta index 611b59a7e..c125ac500 100644 --- a/Assets/arts/spines/characters/m20023/m20023_material.mat.meta +++ b/Assets/arts/spines/characters/m20023/m20023_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20023/m20023_skeletondata.asset.meta b/Assets/arts/spines/characters/m20023/m20023_skeletondata.asset.meta index 2a811a5e7..dc9a1d7d3 100644 --- a/Assets/arts/spines/characters/m20023/m20023_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20023/m20023_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0016/p0016.atlas.txt.meta b/Assets/arts/spines/characters/p0016/p0016.atlas.txt.meta index c057c2d70..d1be0de89 100644 --- a/Assets/arts/spines/characters/p0016/p0016.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0016/p0016.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 48a5edf6c7660d74393fc157ab90c9d9 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0016/p0016.png.meta b/Assets/arts/spines/characters/p0016/p0016.png.meta index baa813f64..746e51d87 100644 --- a/Assets/arts/spines/characters/p0016/p0016.png.meta +++ b/Assets/arts/spines/characters/p0016/p0016.png.meta @@ -35,9 +35,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -68,25 +68,13 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -128,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/p0016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0016/p0016.skel.bytes b/Assets/arts/spines/characters/p0016/p0016.skel.bytes index 982461241..56b8a5e21 100644 Binary files a/Assets/arts/spines/characters/p0016/p0016.skel.bytes and b/Assets/arts/spines/characters/p0016/p0016.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0016/p0016.skel.bytes.meta b/Assets/arts/spines/characters/p0016/p0016.skel.bytes.meta index b7281794d..160fe67e8 100644 --- a/Assets/arts/spines/characters/p0016/p0016.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0016/p0016.skel.bytes.meta @@ -3,5 +3,5 @@ guid: f77a502a17fee164bba0324cf9103dd3 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0016/p0016_atlas.asset.meta b/Assets/arts/spines/characters/p0016/p0016_atlas.asset.meta index 849078c46..d25cedfca 100644 --- a/Assets/arts/spines/characters/p0016/p0016_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0016/p0016_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0016/p0016_material.mat.meta b/Assets/arts/spines/characters/p0016/p0016_material.mat.meta index f8199e9c2..8dcccdfac 100644 --- a/Assets/arts/spines/characters/p0016/p0016_material.mat.meta +++ b/Assets/arts/spines/characters/p0016/p0016_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0016/p0016_skeletondata.asset.meta b/Assets/arts/spines/characters/p0016/p0016_skeletondata.asset.meta index 3861de88f..281f66b9f 100644 --- a/Assets/arts/spines/characters/p0016/p0016_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0016/p0016_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0023/p0023.atlas.txt.meta b/Assets/arts/spines/characters/p0023/p0023.atlas.txt.meta index eeebee6a9..761c0c524 100644 --- a/Assets/arts/spines/characters/p0023/p0023.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0023/p0023.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 378e93614ff37d243ad8782225b03a99 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0023/p0023.png b/Assets/arts/spines/characters/p0023/p0023.png index b2851eea0..e533180f7 100644 Binary files a/Assets/arts/spines/characters/p0023/p0023.png and b/Assets/arts/spines/characters/p0023/p0023.png differ diff --git a/Assets/arts/spines/characters/p0023/p0023.png.meta b/Assets/arts/spines/characters/p0023/p0023.png.meta index 00b6fd82e..fa2bd0800 100644 --- a/Assets/arts/spines/characters/p0023/p0023.png.meta +++ b/Assets/arts/spines/characters/p0023/p0023.png.meta @@ -35,9 +35,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -68,25 +68,13 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -128,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/p0023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0023/p0023.skel.bytes b/Assets/arts/spines/characters/p0023/p0023.skel.bytes index a454469bf..79bdc20f6 100644 Binary files a/Assets/arts/spines/characters/p0023/p0023.skel.bytes and b/Assets/arts/spines/characters/p0023/p0023.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0023/p0023.skel.bytes.meta b/Assets/arts/spines/characters/p0023/p0023.skel.bytes.meta index 43ef138d7..8c8a7efb5 100644 --- a/Assets/arts/spines/characters/p0023/p0023.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0023/p0023.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 23b1805c5dac9344cbad4af83e39b7e2 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0023/p0023_atlas.asset.meta b/Assets/arts/spines/characters/p0023/p0023_atlas.asset.meta index 67fe51db8..693f35e4b 100644 --- a/Assets/arts/spines/characters/p0023/p0023_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0023/p0023_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0023/p0023_material.mat.meta b/Assets/arts/spines/characters/p0023/p0023_material.mat.meta index 41b9347fe..0ede9ac89 100644 --- a/Assets/arts/spines/characters/p0023/p0023_material.mat.meta +++ b/Assets/arts/spines/characters/p0023/p0023_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0023/p0023_skeletondata.asset.meta b/Assets/arts/spines/characters/p0023/p0023_skeletondata.asset.meta index badd3feb9..ea87b6d8e 100644 --- a/Assets/arts/spines/characters/p0023/p0023_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0023/p0023_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0023.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/ui/main_city/cell.meta b/Assets/arts/spines/ui/ui_first_dec.meta similarity index 77% rename from Assets/prefabs/ui/main_city/cell.meta rename to Assets/arts/spines/ui/ui_first_dec.meta index 04d72ada4..179bad561 100644 --- a/Assets/prefabs/ui/main_city/cell.meta +++ b/Assets/arts/spines/ui/ui_first_dec.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a8dce182a930a14a84685252d433055 +guid: 404db01765ba53e4495477220199f4c4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.atlas.txt b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.atlas.txt new file mode 100644 index 000000000..a7f24c922 --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.atlas.txt @@ -0,0 +1,85 @@ +ui_first_dec.png +size:1024,1024 +filter:Linear,Linear +damuzhi +bounds:840,271,43,42 +offsets:1,1,45,45 +rotate:90 +gong +bounds:632,660,125,358 +offsets:1,1,127,360 +guang1 +bounds:1,24,451,541 +rotate:90 +guang2 +bounds:1,477,629,541 +jian +bounds:544,195,280,75 +offsets:1,1,282,77 +rotate:90 +jianjia +bounds:779,316,98,76 +offsets:1,1,100,78 +jiantong +bounds:621,277,156,171 +offsets:1,1,158,173 +jiantou +bounds:952,773,72,49 +offsets:1,1,74,51 +rotate:90 +jianwei +bounds:779,264,59,50 +offsets:1,1,61,52 +lingzi +bounds:653,1,120,86 +offsets:1,1,123,89 +rotate:90 +piaodai +bounds:632,450,208,147 +rotate:90 +piaodai2 +bounds:759,847,234,171 +shenti +bounds:781,479,172,191 +shou1 +bounds:952,711,57,60 +offsets:1,1,59,62 +shou2 +bounds:893,402,63,75 +offsets:2,1,66,77 +tou +bounds:759,672,191,173 +offsets:2,1,194,175 +toufa +bounds:653,123,152,119 +rotate:90 +tui +bounds:544,1,192,107 +rotate:90 +xing1 +bounds:774,208,54,54 +offsets:1,1,56,56 +xing2 +bounds:952,672,37,37 +offsets:1,1,39,39 +xing3 +bounds:774,160,46,46 +offsets:1,1,48,48 +xing4 +bounds:955,628,42,42 +offsets:1,1,45,44 +xing5 +bounds:774,125,33,33 +offsets:1,1,35,35 +youshou +bounds:741,11,110,73 +rotate:90 +youyan +bounds:1,3,19,41 +offsets:1,1,21,43 +rotate:90 +zuoshou +bounds:781,394,110,83 +zuoyan +bounds:621,234,19,41 +offsets:1,1,21,43 diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.atlas.txt.meta b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.atlas.txt.meta new file mode 100644 index 000000000..135e859a0 --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f92edc60bd4072445a8fa6cff8f38cad +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.png b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.png new file mode 100644 index 000000000..cffe34a10 Binary files /dev/null and b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.png differ diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.png.meta b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.png.meta new file mode 100644 index 000000000..08bdf52ec --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: e9cdcef114f18384b87f76ae4162723e +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: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.skel.bytes b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.skel.bytes new file mode 100644 index 000000000..da9bec847 Binary files /dev/null and b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.skel.bytes.meta b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.skel.bytes.meta new file mode 100644 index 000000000..315afd148 --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5626bd45c55003f42b879d12dd41cb86 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_atlas.asset b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_atlas.asset new file mode 100644 index 000000000..a65f34fce --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_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: ui_first_dec_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: f92edc60bd4072445a8fa6cff8f38cad, type: 3} + materials: + - {fileID: 2100000, guid: 281c08f735d5f72488da718f2918e5ed, type: 2} diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_atlas.asset.meta b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_atlas.asset.meta new file mode 100644 index 000000000..ec0736f16 --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e10b642334073846b0dbfb8a41702f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat new file mode 100644 index 000000000..070ae57d4 --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_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: ui_first_dec_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _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: e9cdcef114f18384b87f76ae4162723e, 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: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat.meta b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat.meta new file mode 100644 index 000000000..c150a7c0b --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 281c08f735d5f72488da718f2918e5ed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_skeletondata.asset b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_skeletondata.asset new file mode 100644 index 000000000..6b093bc5f --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_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: ui_first_dec_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 6e10b642334073846b0dbfb8a41702f1, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 5626bd45c55003f42b879d12dd41cb86, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_skeletondata.asset.meta new file mode 100644 index 000000000..c56c63ba7 --- /dev/null +++ b/Assets/arts/spines/ui/ui_first_dec/ui_first_dec_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2226bdf35102e4e4ca697c3315b71c88 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty.meta b/Assets/arts/spines/ui/ui_main_btn_bounty.meta new file mode 100644 index 000000000..5074a83fc --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0da36c6726b26e74396ea95a726d0c90 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt new file mode 100644 index 000000000..6284cb113 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt @@ -0,0 +1,19 @@ +ui_main_btn_bounty.png +size:512,512 +filter:Linear,Linear +2 +bounds:1,304,16,17 +offsets:1,1,18,19 +3 +bounds:484,486,25,27 +offsets:1,1,27,29 +rotate:90 +4 +bounds:449,475,33,36 +offsets:1,1,35,38 +5 +bounds:1,323,247,90 +offsets:1,1,249,92 +6 +bounds:1,415,446,96 +offsets:1,1,448,98 diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt.meta new file mode 100644 index 000000000..99661cff6 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80a3b882f366818468ae31846837f6d0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png new file mode 100644 index 000000000..04c45afae Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png.meta new file mode 100644 index 000000000..843ab669b --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: e8d58aa8e070c9a468c50ee26852d72a +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: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes new file mode 100644 index 000000000..dfa87dc78 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes.meta new file mode 100644 index 000000000..78581da00 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fc48b350677b9334283a8b43d62166a1 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset new file mode 100644 index 000000000..09b5306c9 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_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: ui_main_btn_bounty_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 80a3b882f366818468ae31846837f6d0, type: 3} + materials: + - {fileID: 2100000, guid: ac086f136e0d40647a93009ba00c6b72, type: 2} diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset.meta new file mode 100644 index 000000000..efc39cb35 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 278ea98116e4f3b4fb65d38bb74f3dd8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat new file mode 100644 index 000000000..f2eb580f3 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_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: ui_main_btn_bounty_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: e8d58aa8e070c9a468c50ee26852d72a, 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: [] diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat.meta new file mode 100644 index 000000000..56d76c79e --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac086f136e0d40647a93009ba00c6b72 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset new file mode 100644 index 000000000..1d551c0da --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_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: ui_main_btn_bounty_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 278ea98116e4f3b4fb65d38bb74f3dd8, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: fc48b350677b9334283a8b43d62166a1, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset.meta new file mode 100644 index 000000000..36df4dca4 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: efa393a85a50f18449cc91db7c7a687e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup.meta b/Assets/arts/spines/ui/ui_main_btn_growup.meta new file mode 100644 index 000000000..1a56e5528 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d9922bb1e03e48418de7c0be570f813 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt new file mode 100644 index 000000000..e4b40fea9 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt @@ -0,0 +1,31 @@ +ui_main_btn_growup.png +size:128,128 +filter:Linear,Linear +aixin +bounds:75,49,33,31 +offsets:1,1,35,33 +hua +bounds:2,55,71,71 +offsets:1,1,73,73 +lian +bounds:75,82,49,44 +offsets:1,1,51,46 +xx1 +bounds:110,65,16,15 +offsets:1,1,18,17 +xx2 +bounds:85,27,17,20 +offsets:1,1,19,22 +xx3 +bounds:66,26,17,21 +offsets:1,1,19,23 +yan1 +bounds:110,54,9,16 +offsets:1,1,11,18 +rotate:90 +yan2 +bounds:110,44,8,16 +offsets:1,1,10,18 +rotate:90 +ye +bounds:2,9,62,44 diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt.meta new file mode 100644 index 000000000..5b3eb7531 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5fa297ff1a9c3d547a5efe99efc8c9ec +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png new file mode 100644 index 000000000..8398654e4 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png.meta b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png.meta new file mode 100644 index 000000000..61b9c5f4b --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 28b9030f7b06f3e4f8205f848df76fb7 +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: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes new file mode 100644 index 000000000..fd27d56c7 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes.meta new file mode 100644 index 000000000..5328a171d --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 133d1cc3091353a4997355106c92d961 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset new file mode 100644 index 000000000..777b8d596 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_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: ui_main_btn_growup_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 5fa297ff1a9c3d547a5efe99efc8c9ec, type: 3} + materials: + - {fileID: 2100000, guid: fcd4c8a9a118ddf45abdb42492c6b50d, type: 2} diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset.meta new file mode 100644 index 000000000..03ad7421e --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32a0e043d82c89944b4ff56bcb90189b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat new file mode 100644 index 000000000..b47e1abad --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_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: ui_main_btn_growup_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _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: 28b9030f7b06f3e4f8205f848df76fb7, 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: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat.meta b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat.meta new file mode 100644 index 000000000..e1322fd45 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fcd4c8a9a118ddf45abdb42492c6b50d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset new file mode 100644 index 000000000..df3fa8208 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_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: ui_main_btn_growup_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 32a0e043d82c89944b4ff56bcb90189b, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 133d1cc3091353a4997355106c92d961, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset.meta new file mode 100644 index 000000000..2f89aca1c --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7241c9701e294754783fa2bb3ad3443e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_1.png b/Assets/arts/textures/ui/bounty/bounty_chest_1.png new file mode 100644 index 000000000..577fd354d Binary files /dev/null and b/Assets/arts/textures/ui/bounty/bounty_chest_1.png differ diff --git a/Assets/arts/textures/ui/main/main_btn_fund.png.meta b/Assets/arts/textures/ui/bounty/bounty_chest_1.png.meta similarity index 97% rename from Assets/arts/textures/ui/main/main_btn_fund.png.meta rename to Assets/arts/textures/ui/bounty/bounty_chest_1.png.meta index 6d11a7f26..2baf5172a 100644 --- a/Assets/arts/textures/ui/main/main_btn_fund.png.meta +++ b/Assets/arts/textures/ui/bounty/bounty_chest_1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5962af8bc86575c459b454d2266f805a +guid: a388551653fe1a44f82f1e084eab8c93 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -128,5 +128,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/main.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_2.png b/Assets/arts/textures/ui/bounty/bounty_chest_2.png new file mode 100644 index 000000000..d67554936 Binary files /dev/null and b/Assets/arts/textures/ui/bounty/bounty_chest_2.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_2.png.meta b/Assets/arts/textures/ui/bounty/bounty_chest_2.png.meta new file mode 100644 index 000000000..10f6b449e --- /dev/null +++ b/Assets/arts/textures/ui/bounty/bounty_chest_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 731113889e14bf44a83563cf5c303077 +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: 1 + 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: 8 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_3.png b/Assets/arts/textures/ui/bounty/bounty_chest_3.png new file mode 100644 index 000000000..19680d82a Binary files /dev/null and b/Assets/arts/textures/ui/bounty/bounty_chest_3.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_3.png.meta b/Assets/arts/textures/ui/bounty/bounty_chest_3.png.meta new file mode 100644 index 000000000..d89cd7578 --- /dev/null +++ b/Assets/arts/textures/ui/bounty/bounty_chest_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: db2a9231ef00a9a49a5920a818c08e47 +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: 1 + 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: 8 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_4.png b/Assets/arts/textures/ui/bounty/bounty_chest_4.png new file mode 100644 index 000000000..daa303cd6 Binary files /dev/null and b/Assets/arts/textures/ui/bounty/bounty_chest_4.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_4.png.meta b/Assets/arts/textures/ui/bounty/bounty_chest_4.png.meta new file mode 100644 index 000000000..2ba1c746e --- /dev/null +++ b/Assets/arts/textures/ui/bounty/bounty_chest_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 8c92742a7afdf6b46881adea0c4b5846 +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: 1 + 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: 8 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_5.png b/Assets/arts/textures/ui/bounty/bounty_chest_5.png new file mode 100644 index 000000000..94f6b9945 Binary files /dev/null and b/Assets/arts/textures/ui/bounty/bounty_chest_5.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_chest_5.png.meta b/Assets/arts/textures/ui/bounty/bounty_chest_5.png.meta new file mode 100644 index 000000000..1e7cc14a1 --- /dev/null +++ b/Assets/arts/textures/ui/bounty/bounty_chest_5.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 461a20dd07e8e3e4ca49d2ec52b47f0b +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: 1 + 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: 8 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/main/main_btn_fund.png b/Assets/arts/textures/ui/main/main_btn_fund.png deleted file mode 100644 index 06d2ec9fe..000000000 Binary files a/Assets/arts/textures/ui/main/main_btn_fund.png and /dev/null differ diff --git a/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes b/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes index 8934e9448..dc6bb840e 100644 Binary files a/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes and b/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes differ diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index b3414c72c..69f980e23 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/common/event_manager.lua.bytes b/Assets/lua/app/common/event_manager.lua.bytes index 9d07b75c6..87c579972 100644 Binary files a/Assets/lua/app/common/event_manager.lua.bytes and b/Assets/lua/app/common/event_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_manager.lua.bytes b/Assets/lua/app/common/sdk_manager.lua.bytes index da7768240..e4af08278 100644 Binary files a/Assets/lua/app/common/sdk_manager.lua.bytes and b/Assets/lua/app/common/sdk_manager.lua.bytes differ diff --git a/Assets/lua/app/module/account/account_manager.lua.bytes b/Assets/lua/app/module/account/account_manager.lua.bytes index da3fcf98d..c1cee61fd 100644 Binary files a/Assets/lua/app/module/account/account_manager.lua.bytes and b/Assets/lua/app/module/account/account_manager.lua.bytes differ diff --git a/Assets/lua/app/module/daily_challenge/daily_challenge_manager.lua.bytes b/Assets/lua/app/module/daily_challenge/daily_challenge_manager.lua.bytes index de3a24110..e860ade88 100644 Binary files a/Assets/lua/app/module/daily_challenge/daily_challenge_manager.lua.bytes and b/Assets/lua/app/module/daily_challenge/daily_challenge_manager.lua.bytes differ diff --git a/Assets/lua/app/module/item/item_const.lua.bytes b/Assets/lua/app/module/item/item_const.lua.bytes index c68f8ab01..b1bf88979 100644 Binary files a/Assets/lua/app/module/item/item_const.lua.bytes and b/Assets/lua/app/module/item/item_const.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index 78da5a11a..6a341425c 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes index 29acf9cc1..0575c1b22 100644 Binary files a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes and b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes index 7a86d7f16..b9f857c85 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes index 4b7290cf4..c2ca37594 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 5abc7ce4e..aac866961 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/box_open_ui.lua.bytes b/Assets/lua/app/ui/shop/box_open_ui.lua.bytes index 0884500aa..df9d74193 100644 Binary files a/Assets/lua/app/ui/shop/box_open_ui.lua.bytes and b/Assets/lua/app/ui/shop/box_open_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/box_reward_ui.lua.bytes b/Assets/lua/app/ui/shop/box_reward_ui.lua.bytes index 91a7bf5fc..8fb3ae439 100644 Binary files a/Assets/lua/app/ui/shop/box_reward_ui.lua.bytes and b/Assets/lua/app/ui/shop/box_reward_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/cell/hot_cell.lua.bytes b/Assets/lua/app/ui/shop/cell/hot_cell.lua.bytes index 7a903361a..0e3ab8ccb 100644 Binary files a/Assets/lua/app/ui/shop/cell/hot_cell.lua.bytes and b/Assets/lua/app/ui/shop/cell/hot_cell.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes b/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes index dc9667b8f..cea9e92b9 100644 Binary files a/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes and b/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/player/player_data.lua.bytes b/Assets/lua/app/userdata/player/player_data.lua.bytes index e64d03e1e..37eebb2d0 100644 Binary files a/Assets/lua/app/userdata/player/player_data.lua.bytes and b/Assets/lua/app/userdata/player/player_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/summon/summon_data.lua.bytes b/Assets/lua/app/userdata/summon/summon_data.lua.bytes index e8643db42..2c35d08bf 100644 Binary files a/Assets/lua/app/userdata/summon/summon_data.lua.bytes and b/Assets/lua/app/userdata/summon/summon_data.lua.bytes differ diff --git a/Assets/prefabs/effects/battle/sfx_m20001_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20001_b02.prefab index 2b85e6744..7907e48b0 100644 --- a/Assets/prefabs/effects/battle/sfx_m20001_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20001_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 1675953171269470140} + EffectDuration: 5.4 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20003_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20003_b01.prefab index a8ec629ba..0c90d3ac2 100644 --- a/Assets/prefabs/effects/battle/sfx_m20003_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20003_b01.prefab @@ -9823,8 +9823,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3926221504338144375} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20003_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20003_b02.prefab index e308ee3d6..6f73e0229 100644 --- a/Assets/prefabs/effects/battle/sfx_m20003_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20003_b02.prefab @@ -14712,8 +14712,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4313656513187320559} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20003_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20003_b03.prefab index d9a4da2be..adea2be3a 100644 --- a/Assets/prefabs/effects/battle/sfx_m20003_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20003_b03.prefab @@ -19550,7 +19550,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 4967708124662332982} - EffectDuration: -1 + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20003_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20003_b04.prefab index c2bf0c620..3b7962b5f 100644 --- a/Assets/prefabs/effects/battle/sfx_m20003_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20003_b04.prefab @@ -9823,8 +9823,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 1213338637187695737} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20004_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20004_b01.prefab index faff5e137..59285ef9a 100644 --- a/Assets/prefabs/effects/battle/sfx_m20004_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20004_b01.prefab @@ -4934,8 +4934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4221341596596605878} + EffectDuration: 5.35 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20004_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20004_b02.prefab index a513ad9e2..f33a8240c 100644 --- a/Assets/prefabs/effects/battle/sfx_m20004_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20004_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 329574619537371482} + EffectDuration: 5.35 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20004_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20004_b03.prefab index 0af69354d..30af03277 100644 --- a/Assets/prefabs/effects/battle/sfx_m20004_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20004_b03.prefab @@ -19546,8 +19546,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6439294515643275609} + EffectDuration: 5.35 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20005_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20005_b01.prefab index 632ef704c..8da13a8df 100644 --- a/Assets/prefabs/effects/battle/sfx_m20005_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20005_b01.prefab @@ -4934,8 +4934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4363243175209222800} + EffectDuration: 5.4 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20005_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20005_b02.prefab index 1fc825f34..0c78892b4 100644 --- a/Assets/prefabs/effects/battle/sfx_m20005_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20005_b02.prefab @@ -4934,8 +4934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 84155171554551475} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20005_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20005_b03.prefab index a9ee177c7..4ed215166 100644 --- a/Assets/prefabs/effects/battle/sfx_m20005_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20005_b03.prefab @@ -24437,8 +24437,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 9004857423200580065} + EffectDuration: 5.26 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20009_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20009_b01.prefab index fa870b95c..d7fbf488a 100644 --- a/Assets/prefabs/effects/battle/sfx_m20009_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20009_b01.prefab @@ -24465,7 +24465,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 8087142188657825437} - EffectDuration: -1 + EffectDuration: 5.4 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20009_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20009_b02.prefab index c96d2efbd..a67d17299 100644 --- a/Assets/prefabs/effects/battle/sfx_m20009_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20009_b02.prefab @@ -19548,8 +19548,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6230711453097824929} + EffectDuration: 5.4 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20009_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20009_b03.prefab index b6d161227..ce0b6f3ec 100644 --- a/Assets/prefabs/effects/battle/sfx_m20009_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20009_b03.prefab @@ -4934,8 +4934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 2165076679691664947} + EffectDuration: 5.4 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20009_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20009_b04.prefab index 7efac6086..d578abeea 100644 --- a/Assets/prefabs/effects/battle/sfx_m20009_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20009_b04.prefab @@ -34243,8 +34243,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 9213891147627108893} + EffectDuration: 5.55 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20011_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20011_b02.prefab index c8906d77b..431e4e1d7 100644 --- a/Assets/prefabs/effects/battle/sfx_m20011_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20011_b02.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 1908215290575546597} - EffectDuration: 5.45 + EffectDuration: 5.22 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20013_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20013_b01.prefab index 63f8cbeb3..ad553c4a0 100644 --- a/Assets/prefabs/effects/battle/sfx_m20013_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20013_b01.prefab @@ -34118,7 +34118,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 9017376777855334293} - EffectDuration: -1 + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20013_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20013_b02.prefab index 5c74ad456..33d4a3e4b 100644 --- a/Assets/prefabs/effects/battle/sfx_m20013_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20013_b02.prefab @@ -48810,7 +48810,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 1358283555889807819} - EffectDuration: -1 + EffectDuration: 5.32 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20013_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20013_b03.prefab index 36bb5783c..c66934581 100644 --- a/Assets/prefabs/effects/battle/sfx_m20013_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20013_b03.prefab @@ -78011,7 +78011,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 8364586467249226587} - EffectDuration: -1 + EffectDuration: 5.33 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20014_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20014_b01.prefab index c81a678eb..8d10bd805 100644 --- a/Assets/prefabs/effects/battle/sfx_m20014_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20014_b01.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3723366951524970543} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20014_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20014_b02.prefab index d25346c00..1061f363a 100644 --- a/Assets/prefabs/effects/battle/sfx_m20014_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20014_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 196976808325801557} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20014_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20014_b03.prefab index 8cbd079b3..5e6de1093 100644 --- a/Assets/prefabs/effects/battle/sfx_m20014_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20014_b03.prefab @@ -24409,8 +24409,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7615076359920707368} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20014_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20014_b04.prefab index 69bf6aa83..6ba335d9b 100644 --- a/Assets/prefabs/effects/battle/sfx_m20014_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20014_b04.prefab @@ -24400,8 +24400,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5333689284174166466} + EffectDuration: 5.5 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20015_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20015_b01.prefab index 6a18f9965..9786d45dc 100644 --- a/Assets/prefabs/effects/battle/sfx_m20015_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20015_b01.prefab @@ -24400,8 +24400,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6329759115876495438} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20015_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20015_b02.prefab index 5d42bf129..472008de1 100644 --- a/Assets/prefabs/effects/battle/sfx_m20015_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20015_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3630799053515058565} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20015_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20015_b03.prefab index 487412000..bf6413b6d 100644 --- a/Assets/prefabs/effects/battle/sfx_m20015_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20015_b03.prefab @@ -24409,8 +24409,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8267121726788845428} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20015_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20015_b04.prefab index dbe957857..66a5dd9a9 100644 --- a/Assets/prefabs/effects/battle/sfx_m20015_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20015_b04.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 2951559307045413653} + EffectDuration: 5.5 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20016_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20016_b01.prefab index f6ddbafd7..735cfeac3 100644 --- a/Assets/prefabs/effects/battle/sfx_m20016_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20016_b01.prefab @@ -19709,8 +19709,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3742318992756212220} + EffectDuration: 5.15 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20016_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20016_b02.prefab index f3b083de1..31e9a42f1 100644 --- a/Assets/prefabs/effects/battle/sfx_m20016_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20016_b02.prefab @@ -29407,8 +29407,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6942451540298539274} + EffectDuration: 5.15 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20016_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20016_b03.prefab index e68bc84a3..097e8615e 100644 --- a/Assets/prefabs/effects/battle/sfx_m20016_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20016_b03.prefab @@ -19709,8 +19709,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3966697790311124476} + EffectDuration: 5.15 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20016_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20016_b04.prefab index 899901c7c..c227be33d 100644 --- a/Assets/prefabs/effects/battle/sfx_m20016_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20016_b04.prefab @@ -19731,8 +19731,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 2518843653171236044} + EffectDuration: 0.85 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20017_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20017_b01.prefab index e5bad3fc0..c9badd1d4 100644 --- a/Assets/prefabs/effects/battle/sfx_m20017_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20017_b01.prefab @@ -9814,8 +9814,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 1438907274036568782} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20017_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20017_b02.prefab index a0efb170b..0f5e653a5 100644 --- a/Assets/prefabs/effects/battle/sfx_m20017_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20017_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 219339843367140443} + EffectDuration: 5.28 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20017_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20017_b03.prefab index 3dffea65a..4f32c506c 100644 --- a/Assets/prefabs/effects/battle/sfx_m20017_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20017_b03.prefab @@ -9741,8 +9741,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5682637160204625787} + EffectDuration: 5.24 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20017_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20017_b04.prefab index 3946c849b..cfc80619c 100644 --- a/Assets/prefabs/effects/battle/sfx_m20017_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20017_b04.prefab @@ -34198,8 +34198,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6282709791083064413} + EffectDuration: 5.55 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20018_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20018_b01.prefab index 986cd6422..cce2b0fab 100644 --- a/Assets/prefabs/effects/battle/sfx_m20018_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20018_b01.prefab @@ -9741,8 +9741,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7675512696759602308} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20018_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20018_b02.prefab index 51f31c297..9d6f8a801 100644 --- a/Assets/prefabs/effects/battle/sfx_m20018_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20018_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 554508606244399724} + EffectDuration: 5.28 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20018_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20018_b03.prefab index 16aeba4a0..474bb9220 100644 --- a/Assets/prefabs/effects/battle/sfx_m20018_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20018_b03.prefab @@ -9814,8 +9814,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 1203885472528605699} + EffectDuration: 5.24 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20018_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20018_b04.prefab index a69808ae3..1879bd999 100644 --- a/Assets/prefabs/effects/battle/sfx_m20018_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20018_b04.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 496770772998686335} + EffectDuration: 5.55 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20019_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20019_b01.prefab index 5865a808a..ccee6c95c 100644 --- a/Assets/prefabs/effects/battle/sfx_m20019_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20019_b01.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 2918302395141113084} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20019_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20019_b02.prefab index e384b9b27..5540cac48 100644 --- a/Assets/prefabs/effects/battle/sfx_m20019_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20019_b02.prefab @@ -24436,8 +24436,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 9134918872245601353} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20019_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20019_b03.prefab index 9518226ec..a55bf989d 100644 --- a/Assets/prefabs/effects/battle/sfx_m20019_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20019_b03.prefab @@ -24436,8 +24436,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8316841841682094667} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20019_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20019_b04.prefab index c57cf3de0..018db4e8e 100644 --- a/Assets/prefabs/effects/battle/sfx_m20019_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20019_b04.prefab @@ -19628,8 +19628,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 2055979101368132445} + EffectDuration: 3.65 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20020_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20020_b01.prefab index e8925c673..16a1bd23d 100644 --- a/Assets/prefabs/effects/battle/sfx_m20020_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20020_b01.prefab @@ -9743,8 +9743,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5716186221490050027} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20020_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20020_b02.prefab index f1a6d9b74..515616dab 100644 --- a/Assets/prefabs/effects/battle/sfx_m20020_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20020_b02.prefab @@ -9742,8 +9742,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4614687036733367218} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20020_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20020_b03.prefab index 3382eec7f..6d5d3d76b 100644 --- a/Assets/prefabs/effects/battle/sfx_m20020_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20020_b03.prefab @@ -9823,8 +9823,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 320732603633762798} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20020_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20020_b04.prefab index 8f6cfca02..9dbd0d661 100644 --- a/Assets/prefabs/effects/battle/sfx_m20020_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20020_b04.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3118662154798921900} + EffectDuration: 3.65 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20021_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20021_b01.prefab index 1e45af02f..ca9655448 100644 --- a/Assets/prefabs/effects/battle/sfx_m20021_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20021_b01.prefab @@ -9743,8 +9743,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5836838335911233597} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20021_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20021_b02.prefab index a1eb814a3..b0fbf02da 100644 --- a/Assets/prefabs/effects/battle/sfx_m20021_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20021_b02.prefab @@ -29335,8 +29335,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6341524086245996491} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20021_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20021_b04.prefab index 942e20156..d513b4859 100644 --- a/Assets/prefabs/effects/battle/sfx_m20021_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20021_b04.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3493485180328169313} + EffectDuration: 6.7 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20022_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20022_b01.prefab index 6694639ab..f2e2dbb47 100644 --- a/Assets/prefabs/effects/battle/sfx_m20022_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20022_b01.prefab @@ -24436,8 +24436,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6011457739491674973} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20022_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20022_b02.prefab index 1059fa67d..ae6b1c675 100644 --- a/Assets/prefabs/effects/battle/sfx_m20022_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20022_b02.prefab @@ -24436,8 +24436,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5467960526729699232} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20022_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20022_b04.prefab index fd70272bc..9a97b7508 100644 --- a/Assets/prefabs/effects/battle/sfx_m20022_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20022_b04.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 48584644317858542} + EffectDuration: 5.65 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20023_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20023_b01.prefab index fc15333f7..6321336ac 100644 --- a/Assets/prefabs/effects/battle/sfx_m20023_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20023_b01.prefab @@ -29299,8 +29299,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8371898961796522730} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20023_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20023_b02.prefab index 1267c19d8..20a798289 100644 --- a/Assets/prefabs/effects/battle/sfx_m20023_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20023_b02.prefab @@ -24427,8 +24427,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8448136501179596576} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20023_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20023_b03.prefab index 20e052520..6d5311250 100644 --- a/Assets/prefabs/effects/battle/sfx_m20023_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20023_b03.prefab @@ -24409,8 +24409,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8140424857993347699} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20023_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20023_b04.prefab index eeeb89a87..e58574b88 100644 --- a/Assets/prefabs/effects/battle/sfx_m20023_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20023_b04.prefab @@ -29299,8 +29299,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7132569515459374504} + EffectDuration: 6.15 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20024_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20024_b01.prefab index f2d43b246..19b8d16ec 100644 --- a/Assets/prefabs/effects/battle/sfx_m20024_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20024_b01.prefab @@ -43585,8 +43585,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 9213930526055442160} + EffectDuration: 0.6 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20024_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20024_b02.prefab index a04c4a03e..9dcaa36f6 100644 --- a/Assets/prefabs/effects/battle/sfx_m20024_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20024_b02.prefab @@ -4876,8 +4876,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4052197129774096523} + EffectDuration: 0.6 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20024_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20024_b03.prefab index 02a0593f5..83849722b 100644 --- a/Assets/prefabs/effects/battle/sfx_m20024_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20024_b03.prefab @@ -38755,8 +38755,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7266812712726643641} + EffectDuration: 0.61 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20024_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20024_b04.prefab index d74f49a5e..c2e4b494c 100644 --- a/Assets/prefabs/effects/battle/sfx_m20024_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20024_b04.prefab @@ -29040,8 +29040,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5397465971282203361} + EffectDuration: 0.85 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20024_b05.prefab b/Assets/prefabs/effects/battle/sfx_m20024_b05.prefab index c60dd5ac6..aca6db948 100644 --- a/Assets/prefabs/effects/battle/sfx_m20024_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20024_b05.prefab @@ -62953,8 +62953,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8712585406903622563} + EffectDuration: 1.5999999 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20025_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20025_b01.prefab index 75a8a34da..a46ed42c2 100644 --- a/Assets/prefabs/effects/battle/sfx_m20025_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20025_b01.prefab @@ -24436,8 +24436,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7316126472557979554} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20025_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20025_b02.prefab index b898a4123..3aaa9975f 100644 --- a/Assets/prefabs/effects/battle/sfx_m20025_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20025_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 462064279974931996} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20025_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20025_b04.prefab index d03131a7b..5c8c5a48f 100644 --- a/Assets/prefabs/effects/battle/sfx_m20025_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20025_b04.prefab @@ -24436,8 +24436,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6697680674474232529} + EffectDuration: 5.65 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20026_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20026_b01.prefab index 4ca3477ae..b17f35a57 100644 --- a/Assets/prefabs/effects/battle/sfx_m20026_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20026_b01.prefab @@ -29299,8 +29299,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4697322026245436043} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20026_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20026_b03.prefab index 4e34c05df..1df769330 100644 --- a/Assets/prefabs/effects/battle/sfx_m20026_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20026_b03.prefab @@ -24409,8 +24409,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7160926076308127545} + EffectDuration: 5.17 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20026_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20026_b04.prefab index b3788540f..c0a9a1639 100644 --- a/Assets/prefabs/effects/battle/sfx_m20026_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20026_b04.prefab @@ -29299,8 +29299,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7176608145275925989} + EffectDuration: 6.15 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20027_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20027_b01.prefab index 539235ee3..1a8926363 100644 --- a/Assets/prefabs/effects/battle/sfx_m20027_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20027_b01.prefab @@ -4934,8 +4934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3603874330992933241} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20027_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20027_b02.prefab index 37c2c9bf4..6fc631ed4 100644 --- a/Assets/prefabs/effects/battle/sfx_m20027_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20027_b02.prefab @@ -24436,8 +24436,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8915266904187746218} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20027_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20027_b03.prefab index d22eab90c..9a9774c61 100644 --- a/Assets/prefabs/effects/battle/sfx_m20027_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20027_b03.prefab @@ -29268,8 +29268,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8056115713147935956} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20028_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20028_b01.prefab index cb1277b63..5ffb71827 100644 --- a/Assets/prefabs/effects/battle/sfx_m20028_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20028_b01.prefab @@ -4934,8 +4934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 2916546953310549486} + EffectDuration: 5.35 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20028_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20028_b02.prefab index 82e16f3a4..80060c9cc 100644 --- a/Assets/prefabs/effects/battle/sfx_m20028_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20028_b02.prefab @@ -9823,8 +9823,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 2880512567490600636} + EffectDuration: 5.35 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20028_b03.prefab b/Assets/prefabs/effects/battle/sfx_m20028_b03.prefab index d6754ab52..863bbabb9 100644 --- a/Assets/prefabs/effects/battle/sfx_m20028_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20028_b03.prefab @@ -9823,8 +9823,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 567974186805985036} + EffectDuration: 5.35 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20028_b04.prefab b/Assets/prefabs/effects/battle/sfx_m20028_b04.prefab index b6db71129..60c23e565 100644 --- a/Assets/prefabs/effects/battle/sfx_m20028_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20028_b04.prefab @@ -34189,8 +34189,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8756738666762410212} + EffectDuration: 5.5 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20029_b01.prefab b/Assets/prefabs/effects/battle/sfx_m20029_b01.prefab index 03d8f6fb6..e6b18003f 100644 --- a/Assets/prefabs/effects/battle/sfx_m20029_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20029_b01.prefab @@ -4934,8 +4934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4497077013165156826} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_m20029_b02.prefab b/Assets/prefabs/effects/battle/sfx_m20029_b02.prefab index 2e5785961..3d2d8c16e 100644 --- a/Assets/prefabs/effects/battle/sfx_m20029_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_m20029_b02.prefab @@ -14659,7 +14659,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 5639243474614417044} - EffectDuration: -1 + EffectDuration: 5.22 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0019_b02.prefab b/Assets/prefabs/effects/battle/sfx_p0019_b02.prefab index f8ccf8e52..f7b53d3b8 100644 --- a/Assets/prefabs/effects/battle/sfx_p0019_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0019_b02.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 763417472012031900} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0019_b03.prefab b/Assets/prefabs/effects/battle/sfx_p0019_b03.prefab index c520532ef..ad1bfeb15 100644 --- a/Assets/prefabs/effects/battle/sfx_p0019_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0019_b03.prefab @@ -14659,8 +14659,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5709750638277903401} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0019_b04.prefab b/Assets/prefabs/effects/battle/sfx_p0019_b04.prefab index 0dfd12da2..16924e0c9 100644 --- a/Assets/prefabs/effects/battle/sfx_p0019_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0019_b04.prefab @@ -24464,8 +24464,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6989565155765265090} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0019_b05.prefab b/Assets/prefabs/effects/battle/sfx_p0019_b05.prefab index 5bbeca0e7..1e2e30107 100644 --- a/Assets/prefabs/effects/battle/sfx_p0019_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0019_b05.prefab @@ -58521,8 +58521,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5826951883672233030} + EffectDuration: 5.8 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0020_b01.prefab b/Assets/prefabs/effects/battle/sfx_p0020_b01.prefab index 0972cfedd..34dfe172f 100644 --- a/Assets/prefabs/effects/battle/sfx_p0020_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0020_b01.prefab @@ -4961,8 +4961,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4035083759993626547} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0020_b02.prefab b/Assets/prefabs/effects/battle/sfx_p0020_b02.prefab index b29074a03..d296ecd0e 100644 --- a/Assets/prefabs/effects/battle/sfx_p0020_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0020_b02.prefab @@ -14757,8 +14757,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3580833811254327821} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0020_b03.prefab b/Assets/prefabs/effects/battle/sfx_p0020_b03.prefab index 3d8aeff16..0f6e52c34 100644 --- a/Assets/prefabs/effects/battle/sfx_p0020_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0020_b03.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3419434403275989977} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0020_b04.prefab b/Assets/prefabs/effects/battle/sfx_p0020_b04.prefab index ece03112c..deefb467f 100644 --- a/Assets/prefabs/effects/battle/sfx_p0020_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0020_b04.prefab @@ -19576,8 +19576,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7539712345514039172} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0020_b05.prefab b/Assets/prefabs/effects/battle/sfx_p0020_b05.prefab index 1bdcb00bc..d4f1f4659 100644 --- a/Assets/prefabs/effects/battle/sfx_p0020_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0020_b05.prefab @@ -39173,8 +39173,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7682267853326935653} + EffectDuration: 5.7 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0021_b01.prefab b/Assets/prefabs/effects/battle/sfx_p0021_b01.prefab index 73e29f439..a4f15e956 100644 --- a/Assets/prefabs/effects/battle/sfx_p0021_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0021_b01.prefab @@ -4925,8 +4925,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 3212789955270874314} + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0021_b02.prefab b/Assets/prefabs/effects/battle/sfx_p0021_b02.prefab index 533ee6b9b..e92c7d496 100644 --- a/Assets/prefabs/effects/battle/sfx_p0021_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0021_b02.prefab @@ -4952,8 +4952,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4195282380445027526} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0021_b03.prefab b/Assets/prefabs/effects/battle/sfx_p0021_b03.prefab index 06b2581fc..da00d6efc 100644 --- a/Assets/prefabs/effects/battle/sfx_p0021_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0021_b03.prefab @@ -4952,8 +4952,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 4043873434766142808} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0021_b04.prefab b/Assets/prefabs/effects/battle/sfx_p0021_b04.prefab index b6b0d65dc..17b0d2dbf 100644 --- a/Assets/prefabs/effects/battle/sfx_p0021_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0021_b04.prefab @@ -34288,8 +34288,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5933370089619235967} + EffectDuration: 5.25 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0021_b05.prefab b/Assets/prefabs/effects/battle/sfx_p0021_b05.prefab index 8a3d1ec65..79a7b5f10 100644 --- a/Assets/prefabs/effects/battle/sfx_p0021_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0021_b05.prefab @@ -29344,8 +29344,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8257085437081558711} + EffectDuration: 2.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0022_b01.prefab b/Assets/prefabs/effects/battle/sfx_p0022_b01.prefab index 36824fc39..7de1ba808 100644 --- a/Assets/prefabs/effects/battle/sfx_p0022_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0022_b01.prefab @@ -29308,8 +29308,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8576872120872843528} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0022_b02.prefab b/Assets/prefabs/effects/battle/sfx_p0022_b02.prefab index 564beb7ee..5457572f1 100644 --- a/Assets/prefabs/effects/battle/sfx_p0022_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0022_b02.prefab @@ -24428,8 +24428,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 6288102174777911957} + EffectDuration: 5.2 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0022_b05.prefab b/Assets/prefabs/effects/battle/sfx_p0022_b05.prefab index d0bf8fe14..0bab4e69f 100644 --- a/Assets/prefabs/effects/battle/sfx_p0022_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0022_b05.prefab @@ -68492,7 +68492,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 3850183025606735451} - EffectDuration: -1 + EffectDuration: 5.28 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0023_b01.prefab b/Assets/prefabs/effects/battle/sfx_p0023_b01.prefab index cde9401c1..6cda806f2 100644 --- a/Assets/prefabs/effects/battle/sfx_p0023_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0023_b01.prefab @@ -9851,7 +9851,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 52836955527080273} - EffectDuration: -1 + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0023_b02.prefab b/Assets/prefabs/effects/battle/sfx_p0023_b02.prefab index 86b1ea027..cefdbce5c 100644 --- a/Assets/prefabs/effects/battle/sfx_p0023_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0023_b02.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 983652402103772549} - EffectDuration: -1 + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0023_b03.prefab b/Assets/prefabs/effects/battle/sfx_p0023_b03.prefab index 8ed79a691..210133cd0 100644 --- a/Assets/prefabs/effects/battle/sfx_p0023_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0023_b03.prefab @@ -24465,7 +24465,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 7395653891778393225} - EffectDuration: -1 + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/effects/battle/sfx_p0023_b04.prefab b/Assets/prefabs/effects/battle/sfx_p0023_b04.prefab index 1faecca76..6c3944617 100644 --- a/Assets/prefabs/effects/battle/sfx_p0023_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0023_b04.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: GroupOrder: 0 RootParticle: {fileID: 3409610241522067580} - EffectDuration: -1 + EffectDuration: 5.3 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 diff --git a/Assets/prefabs/ui/common/message_box.prefab b/Assets/prefabs/ui/common/message_box.prefab index 8eb55ebe8..31c8b610f 100644 --- a/Assets/prefabs/ui/common/message_box.prefab +++ b/Assets/prefabs/ui/common/message_box.prefab @@ -728,7 +728,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -1533,7 +1533,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} diff --git a/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab b/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab deleted file mode 100644 index 931d8b770..000000000 --- a/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab +++ /dev/null @@ -1,447 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1886348764626124569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8032025172877121001} - - component: {fileID: 3400584062289878411} - - component: {fileID: 5879989463083505207} - - component: {fileID: 8872205515227162161} - - component: {fileID: 6323538229666421987} - m_Layer: 5 - m_Name: side_bar_base_cell - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8032025172877121001 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1886348764626124569} - 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: 1428946446916460209} - - {fileID: 5841790680202852062} - - {fileID: 69754800809698318} - - {fileID: 7796595949412098847} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -32} - m_SizeDelta: {x: 64, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3400584062289878411 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1886348764626124569} - m_CullTransparentMesh: 1 ---- !u!114 &5879989463083505207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1886348764626124569} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &8872205515227162161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1886348764626124569} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 ---- !u!114 &6323538229666421987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1886348764626124569} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabList: - - name: side_bar_base_cell.icon - hashName: 3436508971 - objectType: 0 - gameObject: {fileID: 7664071059432299559} - - name: side_bar_base_cell.info - hashName: 3436519264 - objectType: 0 - gameObject: {fileID: 5235462503420730942} - - name: side_bar_base_cell.effect_node - hashName: 2116696318 - objectType: 0 - gameObject: {fileID: 0} - - name: side_bar_base_cell.rpRoot - hashName: 4219046514 - objectType: 0 - gameObject: {fileID: 2576462280328218393} - - name: side_bar_base_cell.bg - hashName: 1196870519 - objectType: 0 - gameObject: {fileID: 6644034033586198925} ---- !u!1 &2576462280328218393 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7796595949412098847} - - component: {fileID: 2132045105374938157} - m_Layer: 5 - m_Name: rpRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7796595949412098847 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2576462280328218393} - 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: 8032025172877121001} - m_RootOrder: 3 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2132045105374938157 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2576462280328218393} - m_CullTransparentMesh: 1 ---- !u!1 &5235462503420730942 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 69754800809698318} - - component: {fileID: 2542523108924560882} - - component: {fileID: 5399492499202496278} - m_Layer: 5 - m_Name: info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &69754800809698318 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5235462503420730942} - 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: 8032025172877121001} - 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: 0, y: -40} - m_SizeDelta: {x: 72, y: 15} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2542523108924560882 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5235462503420730942} - m_CullTransparentMesh: 1 ---- !u!114 &5399492499202496278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5235462503420730942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6644034033586198925 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1428946446916460209} - - component: {fileID: 398465592708849108} - - component: {fileID: 6547105876192134503} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1428946446916460209 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6644034033586198925} - 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: 8032025172877121001} - 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: 64, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &398465592708849108 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6644034033586198925} - m_CullTransparentMesh: 1 ---- !u!114 &6547105876192134503 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6644034033586198925} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, 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 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7664071059432299559 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5841790680202852062} - - component: {fileID: 2415521907619756768} - - component: {fileID: 4781327074947000708} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5841790680202852062 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7664071059432299559} - 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: 8032025172877121001} - 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: 64, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2415521907619756768 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7664071059432299559} - m_CullTransparentMesh: 1 ---- !u!114 &4781327074947000708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7664071059432299559} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, 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 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab.meta b/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab.meta deleted file mode 100644 index a93ccf3e2..000000000 --- a/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0a35b9989a9755e46a0bac6afac70d64 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: prefabs/ui/main_city/cell/side_bar_base_cell.prefab.ab - assetBundleVariant: diff --git a/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab b/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab index 815675f7b..96acb1f8c 100644 --- a/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab +++ b/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab @@ -106,7 +106,7 @@ RectTransform: - {fileID: 406476123387572838} - {fileID: 596286184576100891} m_Father: {fileID: 6324133390888120675} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -342,8 +342,8 @@ RectTransform: m_Children: - {fileID: 1035592994207993071} - {fileID: 4980101470244399669} - - {fileID: 917114074627242966} - {fileID: 8391817330094096387} + - {fileID: 917114074627242966} - {fileID: 1772827000899803993} - {fileID: 7685615799625947384} m_Father: {fileID: 4097550255718150601} @@ -1344,7 +1344,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6324133390888120675} - m_RootOrder: 3 + 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} diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index e0ede8654..cbf0716cf 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -756,6 +756,102 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -140} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2568113854522035899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1220542898982553693} + - component: {fileID: 5737862896821467254} + - component: {fileID: 1928384712603987880} + m_Layer: 5 + m_Name: spine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1220542898982553693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2568113854522035899} + 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: 2732517323862691995} + 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: -5, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5737862896821467254 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2568113854522035899} + m_CullTransparentMesh: 1 +--- !u!114 &1928384712603987880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2568113854522035899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + skeletonDataAsset: {fileID: 11400000, guid: efa393a85a50f18449cc91db7c7a687e, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + disableMeshAssignmentOnOverride: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 --- !u!1 &2621872992447057484 GameObject: m_ObjectHideFlags: 0 @@ -1288,7 +1384,7 @@ RectTransform: - {fileID: 759060791702564536} - {fileID: 1691310444861320729} m_Father: {fileID: 2732517323862691995} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1764,7 +1860,7 @@ RectTransform: m_Children: - {fileID: 6963299347440152119} m_Father: {fileID: 7703189336704565753} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1916,7 +2012,7 @@ RectTransform: - {fileID: 3696961338274091344} - {fileID: 3949621824981300676} m_Father: {fileID: 7703189336704565753} - m_RootOrder: 1 + 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} @@ -2516,6 +2612,102 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6514679323496544804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7582710375693909186} + - component: {fileID: 3921496468517784809} + - component: {fileID: 7136499003676531511} + m_Layer: 5 + m_Name: ui_spine_obj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7582710375693909186 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6514679323496544804} + 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: 7703189336704565753} + 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: -50} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3921496468517784809 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6514679323496544804} + m_CullTransparentMesh: 1 +--- !u!114 &7136499003676531511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6514679323496544804} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + skeletonDataAsset: {fileID: 0} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + disableMeshAssignmentOnOverride: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 --- !u!1 &6627197415179274159 GameObject: m_ObjectHideFlags: 0 @@ -2546,7 +2738,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2732517323862691995} - m_RootOrder: 1 + 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} @@ -2782,6 +2974,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1220542898982553693} - {fileID: 7791805197152138237} - {fileID: 4269294849383474259} m_Father: {fileID: 964155233308309585} @@ -3481,6 +3674,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5685856364196914479} + - {fileID: 7582710375693909186} - {fileID: 120835241197761831} - {fileID: 7228277265609253518} m_Father: {fileID: 7568320451737155576} @@ -3569,6 +3763,10 @@ MonoBehaviour: hashName: 2861009151 objectType: 0 gameObject: {fileID: 5385636119876016052} + - name: side_bar_cell.ui_spine_obj + hashName: 3379195432 + objectType: 6 + gameObject: {fileID: 6514679323496544804} --- !u!1 &7855773179402164867 GameObject: m_ObjectHideFlags: 0 @@ -4387,6 +4585,10 @@ MonoBehaviour: hashName: 1489382735 objectType: 0 gameObject: {fileID: 7383241425811649248} + - name: main_ui.top_node.bounty_node.banner.spine + hashName: 1456509927 + objectType: 6 + gameObject: {fileID: 2568113854522035899} --- !u!114 &6214590949040345325 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5051,16 +5253,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} ---- !u!1 &4175967731956866547 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8889665677046596496, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} - m_PrefabInstance: {fileID: 4803769959397203555} - m_PrefabAsset: {fileID: 0} --- !u!224 &8897476989028766107 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4165930251451731960, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} m_PrefabInstance: {fileID: 4803769959397203555} m_PrefabAsset: {fileID: 0} +--- !u!1 &4175967731956866547 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8889665677046596496, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + m_PrefabInstance: {fileID: 4803769959397203555} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4995549557732434771 PrefabInstance: m_ObjectHideFlags: 0 @@ -6301,16 +6503,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} ---- !u!224 &2195415561721556952 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} - m_PrefabInstance: {fileID: 7717335971750466713} - m_PrefabAsset: {fileID: 0} --- !u!1 &4044924788262064527 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} m_PrefabInstance: {fileID: 7717335971750466713} m_PrefabAsset: {fileID: 0} +--- !u!224 &2195415561721556952 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} + m_PrefabInstance: {fileID: 7717335971750466713} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8329023202578667452 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/shop/first_recharge_pop_ui.prefab b/Assets/prefabs/ui/shop/first_recharge_pop_ui.prefab index 8efea1393..1b28b0a80 100644 --- a/Assets/prefabs/ui/shop/first_recharge_pop_ui.prefab +++ b/Assets/prefabs/ui/shop/first_recharge_pop_ui.prefab @@ -566,78 +566,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3524403823537646863 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6367979773758997921} - - component: {fileID: 487397155112687075} - - component: {fileID: 2581703404223127838} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6367979773758997921 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3524403823537646863} - 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: 6532261956592226185} - 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: 380} - m_SizeDelta: {x: 529, y: 500} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &487397155112687075 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3524403823537646863} - m_CullTransparentMesh: 1 ---- !u!114 &2581703404223127838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3524403823537646863} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: f93bd597ab6db3140bbc1553d88e00bb, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &4117970956418931131 GameObject: m_ObjectHideFlags: 0 @@ -667,7 +595,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6367979773758997921} + - {fileID: 5418179197447790891} - {fileID: 5677724647850855975} - {fileID: 2609866135169838306} - {fileID: 4974482809545163014} @@ -1190,10 +1118,6 @@ MonoBehaviour: hashName: 3838744239 objectType: 0 gameObject: {fileID: 1691702521576416483} - - name: first_recharge_pop_ui.bg.icon - hashName: 1165885919 - objectType: 0 - gameObject: {fileID: 3524403823537646863} - name: first_recharge_pop_ui.bg.title_bg.title hashName: 2826437468 objectType: 0 @@ -1341,6 +1265,120 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2640268199977609927, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3} m_PrefabInstance: {fileID: 1746181245296317343} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7189471872582257333 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6532261956592226185} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 2226bdf35102e4e4ca697c3315b71c88, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: idle + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: 170 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &5418179197447790891 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 7189471872582257333} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7831741458998373251 PrefabInstance: m_ObjectHideFlags: 0 @@ -1438,16 +1476,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3} ---- !u!224 &5813120894633284862 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4324500158412275581, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3} - m_PrefabInstance: {fileID: 7831741458998373251} - m_PrefabAsset: {fileID: 0} --- !u!1 &5191509819229520196 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2640268199977609927, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3} m_PrefabInstance: {fileID: 7831741458998373251} m_PrefabAsset: {fileID: 0} +--- !u!224 &5813120894633284862 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4324500158412275581, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3} + m_PrefabInstance: {fileID: 7831741458998373251} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8722166504179809915 PrefabInstance: m_ObjectHideFlags: 0