From 030254afe440a7827ea185119170197deb4d0144 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 23 Dec 2022 16:19:25 +0800 Subject: [PATCH 01/18] =?UTF-8?q?Revert=20"=E9=94=BB=E5=99=A8=E9=98=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9bdfb3aa91dfb78fef80aea8f2d8eccbc996b23c. --- .../~Lua/Modules/Compound/CompoundPanel.lua | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua index 37be598dfd..0da4153695 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua @@ -2,10 +2,10 @@ CompoundPanel = Inherit(BasePanel) local this = CompoundPanel local TabBox = require("Modules/Common/TabBox") -local _TabData={ --[1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10385] , funcType = FUNCTION_OPEN_TYPE.COMPOUND},--装备暂时屏蔽 +local _TabData={ [1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10385] , funcType = FUNCTION_OPEN_TYPE.COMPOUND}, --[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "宝器锻造" }, - [1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10387] , funcType = FUNCTION_OPEN_TYPE.hunyin}, - [2] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10386], funcType = FUNCTION_OPEN_TYPE.Treasure }, + [2] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10387] , funcType = FUNCTION_OPEN_TYPE.hunyin}, + [3] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10386], funcType = FUNCTION_OPEN_TYPE.Treasure }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1), @@ -14,10 +14,10 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), local curIndex = 1 this.contents = { - --[1] = {view = require("Modules/Compound/view/CompoundPanel_Equip"), panelName = "CompoundPanel_Equip"},--装备暂时屏蔽 + [1] = {view = require("Modules/Compound/view/CompoundPanel_Equip"), panelName = "CompoundPanel_Equip"}, --[2] = {view = require("Modules/Compound/view/CompoundPanel_Talisman"), panelName = "CompoundPanel_Talisman"}, - [1] = {view = require("Modules/Compound/view/CompoundPanel_SoulPrint"), panelName = "CompoundPanel_SoulPrint"}, - [2] = {view = require("Modules/Compound/view/CompoundPanel_Treasure"), panelName = "CompoundPanel_Treasure"}, + [2] = {view = require("Modules/Compound/view/CompoundPanel_SoulPrint"), panelName = "CompoundPanel_SoulPrint"}, + [3] = {view = require("Modules/Compound/view/CompoundPanel_Treasure"), panelName = "CompoundPanel_Treasure"}, } --初始化组件(用于子类重写) function CompoundPanel:InitComponent() @@ -49,18 +49,17 @@ function CompoundPanel:BindEvent() end function CompoundPanel.RefreshHelpBtn() - -- if curIndex==1 then - -- this.HelpBtn:SetActive(true) - -- Util.AddOnceClick(this.HelpBtn, function() - -- UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EquipCompose,this.helpPosition.x,this.helpPosition.y) - -- end) - -- else if curIndex==1 then + this.HelpBtn:SetActive(true) + Util.AddOnceClick(this.HelpBtn, function() + UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EquipCompose,this.helpPosition.x,this.helpPosition.y) + end) + elseif curIndex==2 then this.HelpBtn:SetActive(true) Util.AddOnceClick(this.HelpBtn, function() UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TreasureCompose,this.helpPosition.x,this.helpPosition.y) end) - elseif curIndex==2 then + elseif curIndex==3 then this.HelpBtn:SetActive(true) Util.AddOnceClick(this.HelpBtn, function() UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.SoulPrintCommond,this.helpPosition.x,this.helpPosition.y) From da5316e20b73f7157a58e354c07771300ecf58f6 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 23 Dec 2022 16:19:47 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=90=8D=E6=9C=9B=E7=89=B9=E6=9D=83?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/r_zjm_tequanpaizi_014_zh.png | Bin 0 -> 4408 bytes .../ArtFont/r_zjm_tequanpaizi_014_zh.png.meta | 110 ++++++++++++++++++ .../ArtFont/r_zjm_tequanpaizi_015_zh.png | Bin 0 -> 4385 bytes .../ArtFont/r_zjm_tequanpaizi_015_zh.png.meta | 110 ++++++++++++++++++ .../ArtFont/r_zjm_tequanpaizi_016_zh.png | Bin 0 -> 4584 bytes .../ArtFont/r_zjm_tequanpaizi_016_zh.png.meta | 110 ++++++++++++++++++ .../ArtFont/r_zjm_tequanpaizi_017_zh.png | Bin 0 -> 4271 bytes .../ArtFont/r_zjm_tequanpaizi_017_zh.png.meta | 110 ++++++++++++++++++ .../ArtFont/r_zjm_tequanpaizi_018_zh.png | Bin 0 -> 4693 bytes .../ArtFont/r_zjm_tequanpaizi_018_zh.png.meta | 110 ++++++++++++++++++ .../ArtFont/r_zjm_tequanpaizi_019_zh.png | Bin 0 -> 4546 bytes .../ArtFont/r_zjm_tequanpaizi_019_zh.png.meta | 110 ++++++++++++++++++ .../ArtFont/r_zjm_tequanpaizi_020_zh.png | Bin 0 -> 4810 bytes .../ArtFont/r_zjm_tequanpaizi_020_zh.png.meta | 110 ++++++++++++++++++ .../UI/PlayerInfoView/PlayerInfoView.prefab | 77 ++++++------ .../~Lua/View/PlayerInfoView.lua | 4 +- 16 files changed, 808 insertions(+), 43 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_014_zh.png create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_014_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_015_zh.png create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_015_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_016_zh.png create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_016_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_017_zh.png create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_017_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_018_zh.png create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_018_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_019_zh.png create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_019_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_020_zh.png create mode 100644 Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_020_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_014_zh.png b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_014_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..4fd6fa14a4ac702ea82638d11b83f3b6f6f8356d GIT binary patch literal 4408 zcmV-85y$R{P)n08+cPio!sHP`bazjC&zX~XGjs3UnLGD0cVf~_ zQSd(kKLAJofU~%?{;vrCKOw~3mZqM2|LO0_hbd5MFi_%vQoHvvhAH+yspkTvP6JBa z0+c%0NIXNu*tuW4{6WAJ05Q{Ni33pA0;tadsDt|%TSR`hH2vlsGQ!@fADsS5Ev6d@ zptk=nY4uV5D1x9=K$Ll`@B8?7E>Nm$pj3XWezLTZ-)~OvdISJ_k~V#`#sE%#r5GsH zSfEsCm>2u!#7E;J4UYMPfH{kq?*O0;0Ftr2*Ft4kS=FjAeh>h3iEAEL8pHnhklEHB zZ2B}2D3u2Q#J#|hwSFe+!uQ$RW8d=yfI@N2<4z;-(K?m@Kro)aPrns}eFX{P`%i;0 zZgPmbtzKO5^Z6Ec0EonV(exM}#TEntI{?@W0P{%3#g{HrVTbG&;^DGIT>Y@Fzgd^Z z#*H&GGvNZIidCsp0y8tSpci%G+hgBr0)VBiJ})nM+S+{D*3Pb*=tg|m<9aauMc-p_ zeM$GTXMq-$mJ^McUtHT7Odmu_Jq+Vko$n~|c;o(*_B>Zc~ z9EwV`07{jLC48S)II3$m`M}Oym(cI3_3M%{zd13hs=UHG>)Yc^Slg1sRricFFItG( zmgE(-@J*y)k#f0wVpnJ9Fk3sj`FwAWiFnL#0N|p^8_VCHzIsEv7FVHA$V&@vaRA`M z5KlLq`NcI)5`a?1VQbI}^2Ard0iXd{Xk2=L(tnT%u*cy%qFwySn)eR?z&~+!7qYro z5WNXW?^QR@722U``a@<4ym&lIYjkQx5m=)qVl>RWM)CvYcs}c70HrA<^E(#o-?CqI;?@^v!Ox@HJrrf%I z^MvS5Sp)hrlgs6vVT~niyp|2p+-*+UI>+1$ zI2dp9m*>w>C)184Q)RYj$DR_3=INXsOQ(B9S}L&et4_EwoTG8{=QzwH1bFJI*BTZ z8!^82VAV_SHxM+p&|`>`9OC89@DWA}ihasoOe5xDGmKze*tpTiY&znDkSe}g-AUq- zfUOva_t15kfQZ}+8CMd|iF2&U*QF%e5fz4a1 znL)lJIbt=3u-=Tr^ITQoan7VroRxJB~>o zed-UCLV`~t4N9f**;h$B89`L`V@hZT-pj-q&o7;%H6`kbU%Oe)Mwc7>A=)EGo2F> zH_}Z!9>=<)y)7jy;I&i481g6}{6L@-bmSl^&5`g&PjyT@uswjiVd-bTT2xt4Rps-N z*Ipt#MeqP9#pglOCXG!3XyE$>Scyt=w1TL)TSeY?3i}a+2H0Z^g{Zyh9mR)QdU)@V zcgBnxqvH#NKZqu5U%vrGd1<2Zn~WLNnkE#A7T>sb>kt5ZhV57(sltn*{`xA<+RD1C z>zN2BC5i+_5Q1pJrxbE7UIzGQkK0Juu@A+{O;cv@#R)q;PQ6zx-4?wd3boaVO0qQ} zBr%VuB>Ox{jj+uJ3O{{Djqn0WSqK30aWn#0C{k-{3%7;K7Y%v%;L%i|lye!p>>snM zaJ5TRl3i#-lmnnf3HU^I7I<8MvjC-)y*F#5o*0pytKiaXPBDC`JoIVlJQ zvzUaBSFCrz?OCGRS2#c^w2=&lW5N;tn4P~h{vR;_Fql5c0C}R@S0ufdBThipne#|U zjw@pqrt1j%5Iuz{ikyt4)=5*N1S^rWJXW`YU}QnADKPz^#alDE6iy} zLW!NX@U?LzMR%eZy3d|gayTZPy7W}~ zaKRij_KLYBubvV*t$owhb(2A@_?o=nWE?;H^H;kLOWk}tS4|3>;AKD1u6lM@NEN6R z!Ne?NorZ6II7<5ymmy9r&|@28e|^$u={(peTF=s$oYd9der*~#$k~zBx~=j5C<`gN zNDIPZfC)06oB3mA>=PATEX3v@)@87Ri(|;d*~~nJH;SYLT?yz9uX_Vq5C%;XJ=UGj z(53t_GX^kz*2{bN4WQ(KdTHqhf{2<};zwD@uj(2Zd5Kip#Yap&_7=%Tg`rV<*}REvW!_=xpR7)}g{vL-_Yp1#1bqLwouXTr=kYg_kJ*y= zagytdTbUfvoW!lzbTK_+r+9lp%1qqkNc1NYrU9z%O79fpTxTwE5~Ix$Jhy2|#?JXF z-~Wwx;_i?pDm+tZke04SD1ylx5xUT2{g|JgxN#5nn+qxaTuUe1qYdFYfl?I8+S^AD z9B7l0nRV#xxah4H>uVk`RCPkcVIIRdxUW*%-veEQ?T*tfXne#8`c$ztuf9eq2TF0Y zAm{~M-cOX&*VJ(}4D{rhbeN%( zU~k7QMZXRXRs)k#;)gmrJMfAA9ZdC=ss4@`H4hp@H;bcxe5hmk&ll56L*=9!;dvUC>nIU6YX z-}Iq4I9Lvhj+s9jkMUsmW_(0K=%l3&$OIlbt@ifZhd?QDB&90|5}XIwgrujQOZ$3% zW{l{UG*(tsgU6q+$f|dr7MNS;JpRO`6Y*)+Z__CyU^)_lm$UjZr(tuaygKS7*Yf90 zFtRUPR3Cz%)C#1w<7pVFachkF40fh+I($ntip_blrqvs z2qrB%D!hL1=)91a6ej)7hMkAvt;YI!`ZCSmpUeAs_qMN@yUpvkoYzT%3-k9Q^U-5M zD5chSjP)BiBr_dwdYs15rYIjjZhoAfQ;hBlQv{P&NQC+OiAD9TNf^-P_+fh5Xv4{o z=V8D!F>n+=g(4`9UYhtrZKZTjz$>GqZf=9McM%(F&Q!HZUTgx6B)@H@95K6HezX4UQ^wUtsjarybDX(tXG`Cy5;x!DkAu&D{~ zfKqLyC|GA=LT7r9vQj0)9J*R(Yir5rdtVeFytYfCHI==A2b3aI5C3ThPw>h*`lHXM zQZ^J9RWUbI9{?p|V(x#ia+hquVnO&=KaU|io<-y6(QfN>X_BYO;9SV=ZxLSG)riNj z-zOLvOx(^0fA^YId#fvoYW(nbU2WxqBy)4>lu9MfGcz;QF&QQ%V2gtRRF)F{i3Xu0 zDH7DWeER-*=nx!8^ai!THQAF1NCZ}vW{glBNnE2fqP3;H$8Zuj!n`jUGczP>Cr%i7 z!Q9*|l+IEU{k7GP+V$bFL74Z2gf)iQSZHaH(HA(uUnV;Or7FTH5VSFof+_JM3A2FI zJV}`MMJF1kkjvxDEIEhRb9Hn)ll}Xft68UxX3>dDp=7%U4l~^Wl)c{6$BuRNJ$EGm z&FR78S)>aBKPH5yR}g;K_XV@lHHg;E{VRdPF-N#sH(-2q75v_E0<{pzTp3ea&t;cV?SEpHFM^;0H9PzGnWbiH+%~KF*xb~ z{1AU$C`s&O=CQOe`?BuA6Sa$r!@dCnG$#?QC1%;4pD~UAmD+m^9V13KFX?N31UxHq zYkFfTl~hNI^sgz7Fq^$#>=;+%Gkk$k#WViOkRaUgsY{4iwkL>a@9Ybwq@;Gy%cF;v zbGaOQ%?6g065UPDDTr43`TX9KYo|};C|1VI8hzoyjWhG-O^Of%{oNJcU>$MhH&vLs zty15{xDInT^691%b+hJ--`>?F@7}iQ-(@;H0i?dSXip_JRX#YG=|~8e4NdfGBf5wJ zNCZKj=o`aiD_n6D>Vs*rVJ4=RWztob+{b)9APCxY1b^fSb3f}ZCPy~$yW(PL+4`6x z`M9l4nETn5ekamDcNl)c1mZb09Q%~>!ragLa*}L1=mNNm2s7!m2!b||!_cO^Wh85P z^t-cRSk_lG#e%gafo?Ya4RXR^<#_{<0UNA{6AO3)jm2d{C^jJyY<>hx$oB%YtT4Xz yZ!8S_-v0(SMi4Iw{@8{Kah&~!hTl~X0Pr6I?$B9}HJjD|0000RV literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_014_zh.png.meta b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_014_zh.png.meta new file mode 100644 index 0000000000..dbd848dc96 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_014_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 73147b297ea4eb7428252f50962033f6 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 82e5050df48b67147955163d35c8ef84 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HarmonyAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_015_zh.png b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_015_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..da42169ad2e657dcae8ba4855a437e24e78cd49c GIT binary patch literal 4385 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 b2Y~+r{j;L3?qN4-00000NkvXXu0mjfAGC_* literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_015_zh.png.meta b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_015_zh.png.meta new file mode 100644 index 0000000000..6c1a75942b --- /dev/null +++ b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_015_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 0023b31f212616f47af2ad09bad2f989 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1f586577a45a6024d9ae700a22df701f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HarmonyAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_016_zh.png b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_016_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..ade744efaffa1e713c6b8503996ce87c11f1ad03 GIT binary patch literal 4584 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_018_zh.png.meta b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_018_zh.png.meta new file mode 100644 index 0000000000..3de4486b38 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_018_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 17c1aaee81eefe64ab3a352e0ccfb5e3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ddc9a4b43ba1f584683cfbb25a8cf7db + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HarmonyAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_019_zh.png b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_019_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..c9a1c5a1330155b1ac3cc661e97846676a0119e0 GIT binary patch literal 4546 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_019_zh.png.meta b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_019_zh.png.meta new file mode 100644 index 0000000000..49c7179d9a --- /dev/null +++ b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_019_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4dce17961b4727b41b5f9a22fc0d9c6d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e7d348f7dbc0c9c4db48b9614b130c7d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HarmonyAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_020_zh.png b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_020_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..c6926f0bb24814d8de3cca96b774f50e09aea3f2 GIT binary patch literal 4810 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_020_zh.png.meta b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_020_zh.png.meta new file mode 100644 index 0000000000..6c91984466 --- /dev/null +++ b/Assets/ManagedResources/Atlas/HarmonyAtlas/ArtFont/r_zjm_tequanpaizi_020_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 345e0bffbb16e524b8e4a33d194f83b4 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a443c2f84ac96f249b426099bfaa24e0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HarmonyAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab index ca58239ece..ae3fd4edd0 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab @@ -37,8 +37,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 391.4, y: -34.2} - m_SizeDelta: {x: 76, y: 66} + m_AnchoredPosition: {x: 380.7, y: -36.1} + m_SizeDelta: {x: 138, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &894663350 CanvasRenderer: @@ -68,7 +68,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f8c1fd551ff2f444e8e5341935386559, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e66e46bf0e737d4799e4e225f0f5a5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -129,8 +129,8 @@ GameObject: m_Component: - component: {fileID: 1192759115} - component: {fileID: 1192759117} - - component: {fileID: 1192759116} - component: {fileID: 1536197701761364215} + - component: {fileID: 3630431652348405556} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -154,8 +154,8 @@ RectTransform: 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: 3} - m_SizeDelta: {x: 36.31, y: 30} + m_AnchoredPosition: {x: 0, y: 0.4} + m_SizeDelta: {x: 84, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1192759117 CanvasRenderer: @@ -165,40 +165,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1192759114} m_CullTransparentMesh: 0 ---- !u!114 &1192759116 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1192759114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9411765, g: 0.91764706, b: 0.8235294, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 10 --- !u!114 &1536197701761364215 MonoBehaviour: m_ObjectHideFlags: 0 @@ -214,6 +180,35 @@ MonoBehaviour: m_EffectColor: {r: 0.078431375, g: 0.02745098, b: 0.023529412, a: 0.5} m_EffectDistance: {x: 2, y: -2} m_UseGraphicAlpha: 1 +--- !u!114 &3630431652348405556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192759114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: bf2a3a441bcc85149a8a2066f04fc2be, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &126526265747137757 GameObject: m_ObjectHideFlags: 0 @@ -5952,7 +5947,7 @@ RectTransform: 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: 24.1, y: 16.5} + m_AnchoredPosition: {x: 43.6, y: 16.5} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3783425241992638186 diff --git a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua index 8ca77a4aac..d279d759c1 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua @@ -32,7 +32,7 @@ function PlayerInfoView:InitComponent() self.vipRedPoint = Util.GetGameObject(self.gameObject, "vipPrivilege/vipPrivilegeBtn/redPoint") --名望 self.btn_mingwang=Util.GetGameObject(self.gameObject, "btn_mingwang") - self.mwLvTxt=Util.GetGameObject(self.gameObject, "btn_mingwang/Text"):GetComponent("Text") + self.mwLvTxt=Util.GetGameObject(self.gameObject, "btn_mingwang/Text"):GetComponent("Image") self.mwRed=Util.GetGameObject(self.gameObject, "btn_mingwang/red") screenAdapte(self.vipPrivilegeBtn) @@ -102,7 +102,7 @@ function PlayerInfoView:OnShow() self.playName.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel) self.vipLevelText.sprite = self.spLoader:LoadSprite(VipManager.SetVipLevelImg()) - self.mwLvTxt.text=DynamicActivityManager.curLevel + self.mwLvTxt.sprite=self.spLoader:LoadSprite("r_zjm_tequanpaizi_0" ..DynamicActivityManager.curLevel.."_zh") self.mwRed:SetActive(false) if not self.playerHead then self.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, self.headPos.transform) From 118fdc7a2d8d6aa44a72604f8eb6fd3e6c4cfdf2 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 23 Dec 2022 17:30:23 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E9=94=BB=E5=99=A8=E9=98=81=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E5=90=88=E6=88=90=E6=94=B9=E4=B8=BA=E7=A5=9E=E8=A3=85?= =?UTF-8?q?=E5=8D=87=E6=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/Language.lua | 2 +- .../~Lua/Modules/Compound/view/CompoundPanel_Equip.lua | 3 ++- Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 64c781b914..a5c5dc0bd2 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -383,7 +383,7 @@ Language = { [10382] = GetLanguageStrById("对方已不在你的好友列表中,无法发送消息"), [10383] = GetLanguageStrById("%s元"), [10384] = GetLanguageStrById("未找到符合条件的节点"), - [10385] = GetLanguageStrById("装备合成"), + [10385] = GetLanguageStrById("神装升星"), [10386] = GetLanguageStrById("宝物合成"), [10387] = GetLanguageStrById("魂印合成"), [10388] = GetLanguageStrById("是否要将【"), diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua index 8423780c4a..6b08fb03cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua @@ -134,13 +134,14 @@ function this.ShowGoldNum0() end function this:OnShow(...) - curIndex = 1 + curIndex = 5 sortingOrder =0 needGoldNum=0 this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.SwitchView) this.TabCtrl:Init(this.tabBox, _TabData,curIndex) + this.tabBox.gameObject:SetActive(false) end local sortingOrder = 0 function this:OnSortingOrderChange(_sortingOrder) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index b3efd458c9..6166a11488 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -422,12 +422,12 @@ function this.GetAllGodEquips() local starEquips2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipConfig, "Quality", 8) local equips = {} for i = 1, #starEquips do - if starEquips[i].Star and starEquips[i].Star > 0 and starEquips[i].Star ~= 1 then --最低等级的装备 合成不了 + if starEquips[i].Star and starEquips[i].Star > 0 and starEquips[i].Star ~= 18 then --最低等级的装备 合成不了 table.insert(equips, starEquips[i]) end end for i = 1, #starEquips2 do - if starEquips2[i].Star and starEquips2[i].Star > 0 and starEquips2[i].Star ~= 1 then --最低等级的装备 合成不了 + if starEquips2[i].Star and starEquips2[i].Star > 0 and starEquips2[i].Star ~= 18 then --最低等级的装备 合成不了 table.insert(equips, starEquips2[i]) end end From 22ca5ed37be2ec1124566c8c3209a805e10333bd Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 23 Dec 2022 18:23:15 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E9=94=BB=E5=99=A8=E9=98=81=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=A3=98=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a6e31cfcea..651385162c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -605,8 +605,10 @@ function this:BindEvent() Util.AddClick(this.btnEquipCompound, function() --JumpManager.GoJump(20003) --this.ScenceBtnClick(FUNCTION_OPEN_TYPE.SHOP) - if ActTimeCtrlManager.IsQualifiled(66) then + if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.COMPOUND) then UIManager.OpenPanel(UIName.CompoundPanel) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.COMPOUND)) end this.ScenceBtnClick(FUNCTION_OPEN_TYPE.COMPOUND) end) From 3a77e7088e966f31d7d7794f5486d258249c8023 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 26 Dec 2022 13:45:47 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/PlayerInfoView/PlayerInfoView.prefab | 4978 ++++++++++++++++- .../~Lua/View/PlayerInfoView.lua | 3 +- 2 files changed, 4964 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab index ae3fd4edd0..4c06977584 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab @@ -32,6 +32,8 @@ RectTransform: m_Children: - {fileID: 1192759115} - {fileID: 4224327922107304497} + - {fileID: 5983678170652136938} + - {fileID: 5019599406132462070} m_Father: {fileID: 6855514544870948464} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -129,7 +131,6 @@ GameObject: m_Component: - component: {fileID: 1192759115} - component: {fileID: 1192759117} - - component: {fileID: 1536197701761364215} - component: {fileID: 3630431652348405556} m_Layer: 0 m_Name: Text @@ -165,21 +166,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1192759114} m_CullTransparentMesh: 0 ---- !u!114 &1536197701761364215 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1192759114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0.078431375, g: 0.02745098, b: 0.023529412, a: 0.5} - m_EffectDistance: {x: 2, y: -2} - m_UseGraphicAlpha: 1 --- !u!114 &3630431652348405556 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5742,6 +5728,4817 @@ RectTransform: m_AnchoredPosition: {x: -0.000015258789, y: -50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3419406478792727548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1382406166018394285} + - component: {fileID: 7119247152579121614} + - component: {fileID: 3759976338033863622} + m_Layer: 5 + m_Name: lizi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1382406166018394285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3419406478792727548} + 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: 5983678170652136938} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!198 &7119247152579121614 +ParticleSystem: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3419406478792727548} + serializedVersion: 6 + lengthInSec: 1.9 + simulationSpeed: 1 + stopAction: 0 + cullingMode: 0 + ringBufferMode: 0 + ringBufferLoopRange: {x: 0, y: 1} + looping: 0 + prewarm: 0 + playOnAwake: 1 + useUnscaledTime: 0 + autoRandomSeed: 1 + useRigidbodyForVelocity: 1 + startDelay: + serializedVersion: 2 + minMaxState: 0 + scalar: 0.1 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + moveWithTransform: 1 + moveWithCustomTransform: {fileID: 0} + scalingMode: 1 + randomSeed: 0 + InitialModule: + serializedVersion: 3 + enabled: 1 + startLifetime: + serializedVersion: 2 + minMaxState: 3 + scalar: 3 + minScalar: 3 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startSpeed: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 5 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startColor: + serializedVersion: 2 + minMaxState: 2 + minColor: {r: 1, g: 0.74319917, b: 0.1745283, a: 1} + maxColor: {r: 0.9622642, g: 0.89104486, b: 0.5582948, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + startSize: + serializedVersion: 2 + minMaxState: 3 + scalar: 0.15 + minScalar: 0.1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startSizeY: + serializedVersion: 2 + minMaxState: 3 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startSizeZ: + serializedVersion: 2 + minMaxState: 3 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startRotationX: + serializedVersion: 2 + minMaxState: 3 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startRotationY: + serializedVersion: 2 + minMaxState: 3 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startRotation: + serializedVersion: 2 + minMaxState: 3 + scalar: 6.283185 + minScalar: -6.283185 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + randomizeRotationDirection: 0 + maxNumParticles: 1000 + size3D: 0 + rotation3D: 0 + gravityModifier: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + ShapeModule: + serializedVersion: 6 + enabled: 1 + type: 5 + angle: 25 + length: 5 + boxThickness: {x: 0, y: 0, z: 0} + radiusThickness: 1 + donutRadius: 0.2 + m_Position: {x: 0, y: 0, z: 0} + m_Rotation: {x: 0, y: 0, z: 0} + m_Scale: {x: 0.185, y: 0.1, z: 0.1} + placementMode: 0 + m_MeshMaterialIndex: 0 + m_MeshNormalOffset: 0 + m_MeshSpawn: + mode: 0 + spread: 0 + speed: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Mesh: {fileID: 0} + m_MeshRenderer: {fileID: 0} + m_SkinnedMeshRenderer: {fileID: 0} + m_Sprite: {fileID: 0} + m_SpriteRenderer: {fileID: 0} + m_UseMeshMaterialIndex: 0 + m_UseMeshColors: 1 + alignToDirection: 0 + m_Texture: {fileID: 0} + m_TextureClipChannel: 3 + m_TextureClipThreshold: 0 + m_TextureUVChannel: 0 + m_TextureColorAffectsParticles: 1 + m_TextureAlphaAffectsParticles: 1 + m_TextureBilinearFiltering: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 + randomPositionAmount: 0 + radius: + value: 1 + mode: 0 + spread: 0 + speed: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + arc: + value: 360 + mode: 0 + spread: 0 + speed: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + EmissionModule: + enabled: 1 + serializedVersion: 4 + rateOverTime: + serializedVersion: 2 + minMaxState: 1 + scalar: 15 + minScalar: 10 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0.09965166 + outSlope: -0.09965166 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.13986014 + - serializedVersion: 3 + time: 1 + value: 0.37631735 + inSlope: -1.083596 + outSlope: -1.083596 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.09324008 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rateOverDistance: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BurstCount: 0 + m_Bursts: [] + SizeModule: + enabled: 1 + curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 2.5 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.00466156 + value: 0.602787 + inSlope: -0.0000004621975 + outSlope: -0.0000004621975 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.08204833 + value: 0.08599529 + inSlope: -0.4411511 + outSlope: -0.4411511 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.17330489 + value: 0.39112994 + inSlope: -0.25972724 + outSlope: -0.25972724 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26890045 + value: 0.06100387 + inSlope: -0.5212426 + outSlope: -0.5212426 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36233175 + value: 0.3026378 + inSlope: -0.16302802 + outSlope: -0.16302802 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43353474 + value: 0.06725297 + inSlope: -0.42580146 + outSlope: -0.42580146 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5035959 + value: 0.22818282 + inSlope: -0.16937032 + outSlope: -0.16937032 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55787784 + value: 0.054038182 + inSlope: -0.45787543 + outSlope: -0.45787543 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.62058103 + value: 0.15569878 + inSlope: 0.13427809 + outSlope: 0.13427809 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.69016016 + value: 0.043009907 + inSlope: -0.036574878 + outSlope: -0.036574878 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75616723 + value: 0.11255672 + inSlope: -0.06742009 + outSlope: -0.06742009 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.83447564 + value: 0.04236789 + inSlope: 0.008639181 + outSlope: 0.008639181 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9184809 + value: 0.08906688 + inSlope: -0.19134022 + outSlope: -0.19134022 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.008333325 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + y: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + z: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + separateAxes: 0 + RotationModule: + enabled: 1 + x: + serializedVersion: 2 + minMaxState: 3 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + y: + serializedVersion: 2 + minMaxState: 3 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curve: + serializedVersion: 2 + minMaxState: 3 + scalar: 2.0943952 + minScalar: -2.0943952 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + separateAxes: 0 + ColorModule: + enabled: 0 + gradient: + serializedVersion: 2 + minMaxState: 1 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 1735 + atime2: 65535 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 3 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + UVModule: + enabled: 0 + mode: 0 + timeMode: 0 + fps: 30 + frameOverTime: + serializedVersion: 2 + minMaxState: 1 + scalar: 0.9999 + minScalar: 0.9999 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + startFrame: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + speedRange: {x: 0, y: 1} + tilesX: 4 + tilesY: 4 + animationType: 0 + rowIndex: 0 + cycles: 1 + uvChannelMask: -1 + randomRow: 1 + sprites: + - sprite: {fileID: 0} + flipU: 0 + flipV: 0 + VelocityModule: + enabled: 0 + x: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + y: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + z: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + orbitalX: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + orbitalY: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + orbitalZ: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + orbitalOffsetX: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + orbitalOffsetY: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + orbitalOffsetZ: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + radial: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + speedModifier: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + inWorldSpace: 0 + InheritVelocityModule: + enabled: 0 + m_Mode: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + ForceModule: + enabled: 0 + x: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + y: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + z: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + inWorldSpace: 0 + randomizePerFrame: 0 + ExternalForcesModule: + enabled: 0 + multiplier: 1 + influenceFilter: 0 + influenceMask: + serializedVersion: 2 + m_Bits: 4294967295 + influenceList: [] + ClampVelocityModule: + enabled: 0 + x: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + y: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + z: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + magnitude: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + separateAxis: 0 + inWorldSpace: 0 + multiplyDragByParticleSize: 1 + multiplyDragByParticleVelocity: 1 + dampen: 0 + drag: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + NoiseModule: + enabled: 0 + strength: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + strengthY: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + strengthZ: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + separateAxes: 0 + frequency: 0.5 + damping: 1 + octaves: 1 + octaveMultiplier: 0.5 + octaveScale: 2 + quality: 2 + scrollSpeed: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remap: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapY: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapZ: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapEnabled: 0 + positionAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rotationAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + sizeAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + SizeBySpeedModule: + enabled: 0 + curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + y: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + z: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + range: {x: 0, y: 1} + separateAxes: 0 + RotationBySpeedModule: + enabled: 0 + x: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + y: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curve: + serializedVersion: 2 + minMaxState: 0 + scalar: 0.7853982 + minScalar: 0.7853982 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + separateAxes: 0 + range: {x: 0, y: 1} + ColorBySpeedModule: + enabled: 0 + gradient: + serializedVersion: 2 + minMaxState: 1 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + range: {x: 0, y: 1} + CollisionModule: + enabled: 0 + serializedVersion: 3 + type: 0 + collisionMode: 0 + colliderForce: 0 + multiplyColliderForceByParticleSize: 0 + multiplyColliderForceByParticleSpeed: 0 + multiplyColliderForceByCollisionAngle: 1 + plane0: {fileID: 0} + plane1: {fileID: 0} + plane2: {fileID: 0} + plane3: {fileID: 0} + plane4: {fileID: 0} + plane5: {fileID: 0} + m_Dampen: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Bounce: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_EnergyLossOnCollision: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minKillSpeed: 0 + maxKillSpeed: 10000 + radiusScale: 1 + collidesWith: + serializedVersion: 2 + m_Bits: 4294967295 + maxCollisionShapes: 256 + quality: 0 + voxelSize: 0.5 + collisionMessages: 0 + collidesWithDynamic: 1 + interiorCollisions: 0 + TriggerModule: + enabled: 0 + collisionShape0: {fileID: 0} + collisionShape1: {fileID: 0} + collisionShape2: {fileID: 0} + collisionShape3: {fileID: 0} + collisionShape4: {fileID: 0} + collisionShape5: {fileID: 0} + inside: 1 + outside: 0 + enter: 0 + exit: 0 + radiusScale: 1 + SubModule: + serializedVersion: 2 + enabled: 0 + subEmitters: + - serializedVersion: 3 + emitter: {fileID: 0} + type: 0 + properties: 0 + emitProbability: 1 + LightsModule: + enabled: 0 + ratio: 0 + light: {fileID: 0} + randomDistribution: 1 + color: 1 + range: 1 + intensity: 1 + rangeCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + intensityCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + maxLights: 20 + TrailModule: + enabled: 0 + mode: 0 + ratio: 1 + lifetime: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minVertexDistance: 0.2 + textureMode: 0 + ribbonCount: 1 + shadowBias: 0.5 + worldSpace: 0 + dieWithParticles: 1 + sizeAffectsWidth: 1 + sizeAffectsLifetime: 0 + inheritParticleColor: 1 + generateLightingData: 0 + splitSubEmitterRibbons: 0 + attachRibbonsToTransform: 0 + colorOverLifetime: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + widthOverTrail: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorOverTrail: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + CustomDataModule: + enabled: 0 + mode0: 0 + vectorComponentCount0: 4 + color0: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + colorLabel0: Color + vector0_0: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel0_0: X + vector0_1: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel0_1: Y + vector0_2: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel0_2: Z + vector0_3: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel0_3: W + mode1: 0 + vectorComponentCount1: 4 + color1: + serializedVersion: 2 + minMaxState: 0 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + maxGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + colorLabel1: Color + vector1_0: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel1_0: X + vector1_1: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel1_1: Y + vector1_2: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel1_2: Z + vector1_3: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + vectorLabel1_3: W +--- !u!199 &3759976338033863622 +ParticleSystemRenderer: + serializedVersion: 6 + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3419406478792727548} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1a81533abef76b342b6a43ce5a69945a, type: 2} + - {fileID: 2100000, guid: 1a81533abef76b342b6a43ce5a69945a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_RenderMode: 0 + m_SortMode: 0 + m_MinParticleSize: 0 + m_MaxParticleSize: 0.5 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_ShadowBias: 0 + m_RenderAlignment: 0 + m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_EnableGPUInstancing: 1 + m_ApplyActiveColorSpace: 1 + m_AllowRoll: 1 + m_VertexStreams: 00010304 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!1 &3639989804846518891 GameObject: m_ObjectHideFlags: 0 @@ -5987,6 +10784,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4400529556766368968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5983678170652136938} + - component: {fileID: 5785454944711434939} + - component: {fileID: 1899064037471815562} + m_Layer: 5 + m_Name: saoguang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5983678170652136938 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4400529556766368968} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: -0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 8.981068} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1382406166018394285} + m_Father: {fileID: 894663347} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 60, y: 2.2} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5785454944711434939 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4400529556766368968} + m_CullTransparentMesh: 0 +--- !u!114 &1899064037471815562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4400529556766368968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: a1c823d564bc8cc42b040dbde4f822ba, type: 2} + m_Color: {r: 1, g: 0.76001304, b: 0.5801887, a: 0} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4894584253430939105 GameObject: m_ObjectHideFlags: 0 @@ -6235,6 +11107,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5488332826830056080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5019599406132462070} + - component: {fileID: 157921232590643450} + - component: {fileID: 3977563822216205337} + m_Layer: 5 + m_Name: di_glow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5019599406132462070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488332826830056080} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5125002, y: 0.725, z: 1} + m_Children: [] + m_Father: {fileID: 894663347} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &157921232590643450 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488332826830056080} + m_CullTransparentMesh: 0 +--- !u!114 &3977563822216205337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488332826830056080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: a12e6945bc589654fa2df8502617bb91, type: 2} + m_Color: {r: 1, g: 0.8299322, b: 0.2971698, a: 0.42643368} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5857322122562630490 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua index d279d759c1..7e33ddbb62 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua @@ -34,6 +34,7 @@ function PlayerInfoView:InitComponent() self.btn_mingwang=Util.GetGameObject(self.gameObject, "btn_mingwang") self.mwLvTxt=Util.GetGameObject(self.gameObject, "btn_mingwang/Text"):GetComponent("Image") self.mwRed=Util.GetGameObject(self.gameObject, "btn_mingwang/red") + self.mwEffect=Util.GetGameObject(self.gameObject, "btn_mingwang/saoguang") screenAdapte(self.vipPrivilegeBtn) end @@ -140,7 +141,7 @@ function PlayerInfoView:SetLayer(sortingOrder) if self.playerHead then self.playerHead:SetLayer(sortingOrder) end - + SetParticleSortLayer(self.mwEffect,sortingOrder) self.orginLayer = sortingOrder end From ec8fa4a8ca5a90f99398388f50bdd083bb2ccc38 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 26 Dec 2022 14:03:59 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E6=AC=A7=E7=9A=87=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E6=A6=82=E7=8E=87=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardItemSingleShowPopup.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 21ecbeb214..3a368d810d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -405,7 +405,9 @@ function RewardItemSingleShowPopup:OnShow() elseif isBagPanel and itemConfigData.ItemType == 10 and func then this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] - this.helpBtn.gameObject:SetActive(true) + if itemConfigData.HeroStar and itemConfigData.HeroStar[1]==1 then + this.helpBtn.gameObject:SetActive(true) + end elseif isBagPanel and itemConfigData.ItemType == 12 and func then-- 改名卡 this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] From c36e9928f0ba448923834d60854e5a54b83d11f0 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 26 Dec 2022 14:29:23 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RolePosInfoPopup.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua index 75a3459ae4..746565a31c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua @@ -72,8 +72,8 @@ function this.RefreshPanel() end local _curData={} for k,v in pairs(curHeroData.RecommendTeamId) do - local _data=ConfigManager.GetConfigData(ConfigName.RecommendTeam,v) - if _data.IsShowInTeam==1 then + local _data=ConfigManager.TryGetConfigData(ConfigName.RecommendTeam,v) + if _data and _data.IsShowInTeam==1 then table.insert(_curData,_data) end end From 65f8e5e166fde8f57c3952eb1ae64444baf2022f Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 26 Dec 2022 15:48:44 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=20=E9=B8=BF=E8=92=99=E9=98=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Harmony/HongMengPanel.prefab | 306 ++++++++++++++++++ .../~Lua/Modules/Harmony/HarmonyPanel.lua | 4 +- .../Popup/RewardItemSingleShowPopup.lua | 8 +- 3 files changed, 313 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab index cea284e229..a88e30542a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &717974134254947682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3743595135909719998} + - component: {fileID: 3243453562427216715} + - component: {fileID: 3851650700008291432} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3743595135909719998 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 717974134254947682} + 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: 222024724411996248} + 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: 43.2, y: -28.65007} + m_SizeDelta: {x: 379.4, y: 2.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3243453562427216715 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 717974134254947682} + m_CullTransparentMesh: 0 +--- !u!114 &3851650700008291432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 717974134254947682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.25882354, g: 0.24313727, b: 0.27450982, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &840206674978318069 GameObject: m_ObjectHideFlags: 0 @@ -953,6 +1027,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3636136740085529164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 640834304260522301} + - component: {fileID: 727597289740280820} + - component: {fileID: 7445398275595482934} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &640834304260522301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3636136740085529164} + 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: 222024724411996248} + 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: 43.2, y: 26} + m_SizeDelta: {x: 379.4, y: 2.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &727597289740280820 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3636136740085529164} + m_CullTransparentMesh: 0 +--- !u!114 &7445398275595482934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3636136740085529164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.25882354, g: 0.24313727, b: 0.27450982, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3694198636868590846 GameObject: m_ObjectHideFlags: 0 @@ -1027,6 +1175,88 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3943532452224250329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 222024724411996248} + - component: {fileID: 1935922215172751236} + - component: {fileID: 5281393037349026581} + m_Layer: 5 + m_Name: GradeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &222024724411996248 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3943532452224250329} + 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: 640834304260522301} + - {fileID: 3743595135909719998} + m_Father: {fileID: 8372305284465964093} + m_RootOrder: 7 + 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: -420.1, y: 86} + m_SizeDelta: {x: 206.9, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1935922215172751236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3943532452224250329} + m_CullTransparentMesh: 0 +--- !u!114 &5281393037349026581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3943532452224250329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7058824, g: 0.7921569, b: 0.80784315, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u9E3F\u8499\u9635\u7B49\u7EA7\uFF1A330/360" + LanguageIndex: 10145 --- !u!1 &4294327751025253158 GameObject: m_ObjectHideFlags: 0 @@ -3574,6 +3804,8 @@ RectTransform: - {fileID: 7797542660600214350} - {fileID: 8864811839897291244} - {fileID: 4820278136986544220} + - {fileID: 5245860039331634989} + - {fileID: 222024724411996248} m_Father: {fileID: 7183224020379597708} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3657,6 +3889,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6711657293456533807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5245860039331634989} + - component: {fileID: 26970790603631487} + - component: {fileID: 2999249952491857369} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5245860039331634989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6711657293456533807} + 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: 8372305284465964093} + m_RootOrder: 6 + 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: -363.1, y: 84.81} + m_SizeDelta: {x: 370.1, y: 57.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &26970790603631487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6711657293456533807} + m_CullTransparentMesh: 0 +--- !u!114 &2999249952491857369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6711657293456533807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 75857acfa9133a247a614d3db9217443, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7116294893561557570 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua index e678728405..3cecd1174b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua @@ -17,7 +17,8 @@ function HarmonyPanel:InitComponent() self.GongMingBtn = Util.GetGameObject(self.gameObject,"Panel/HarmonyPanel/KnowGongMing") self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition self.panel = Util.GetGameObject(self.gameObject,"Panel") - + + self.GradeText = Util.GetGameObject(self.gameObject, "Panel/HarmonyPanel/GradeText"):GetComponent("Text") self.NumText = Util.GetGameObject(self.panel,"HarmonyPanel/itemNumText"):GetComponent("Text") self.parent = Util.GetGameObject(self.gameObject,"MiddleView") --初始化格子中的数据 @@ -106,6 +107,7 @@ function HarmonyPanel:OnOpen() --格子 + self.GradeText.text="鸿蒙阵等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, 330) for i = 1, #contents do contents[i].view:OnOpen(self.sortingOrder) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 3a368d810d..77a7f288c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -402,19 +402,19 @@ function RewardItemSingleShowPopup:OnShow() or itemConfigData.ItemType == ItemType.GMxsZcq and func then--是否宝箱可使用 this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] - elseif isBagPanel and itemConfigData.ItemType == 10 and func then + elseif isBagPanel and itemConfigData.ItemType == ItemType.Box and func then this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] if itemConfigData.HeroStar and itemConfigData.HeroStar[1]==1 then this.helpBtn.gameObject:SetActive(true) end - elseif isBagPanel and itemConfigData.ItemType == 12 and func then-- 改名卡 + elseif isBagPanel and itemConfigData.ItemType == ItemType.ChangeName and func then-- 改名卡 this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] - elseif isBagPanel and itemConfigData.ItemType == 32 then -- 挂机奖励 + elseif isBagPanel and itemConfigData.ItemType == ItemType.TimeIsGold then -- 挂机奖励 this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] - elseif isBagPanel and itemConfigData.ItemType == 34 then + elseif isBagPanel and itemConfigData.ItemType == ItemType.GodPrint then this.btnSure:SetActive(false) else this.btnSure:SetActive(false) From 45e3afaaaa7c0eea29305826fc5bb87e5e02c869 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 26 Dec 2022 16:03:38 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E7=89=A9=E5=93=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FindTreasure/FindTreasureMainPanel.prefab | 24 +++++++++---------- .../Popup/RewardItemSingleShowPopup.lua | 14 +++++++---- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab index 97c803d950..473d6419f2 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab @@ -1579,7 +1579,7 @@ RectTransform: 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: 51.699997, y: -0.78998345} + m_AnchoredPosition: {x: 111.3, y: -0.78998345} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &867443612984388699 @@ -1612,18 +1612,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 45 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\xD71" + m_Text: 15000 --- !u!1 &2269723892978464456 GameObject: m_ObjectHideFlags: 0 @@ -7082,7 +7082,7 @@ ParticleSystem: --- !u!199 &1856602151176858527 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -13044,7 +13044,7 @@ ParticleSystem: --- !u!199 &1472261994721625855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -13626,7 +13626,7 @@ RectTransform: 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: -68.04, y: 0} + m_AnchoredPosition: {x: -52.6, y: 0} m_SizeDelta: {x: 79.48, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4357818227745408231 @@ -13659,7 +13659,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 38 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -13785,7 +13785,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2.55, y: 0.77} + m_AnchoredPosition: {x: -16.3, y: 0.77} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &805268058829116413 @@ -19553,7 +19553,7 @@ ParticleSystem: --- !u!199 &374364804466542659 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24712,7 +24712,7 @@ ParticleSystem: --- !u!199 &1107171649523788123 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30218,7 +30218,7 @@ ParticleSystem: --- !u!199 &8428054502987121459 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 3a368d810d..017cc8fb8d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -337,7 +337,7 @@ end --界面打开时调用(用于子类重写) function RewardItemSingleShowPopup:OnOpen(...) - isBagPanel = BagManager.isBagPanel + itemNu = 0 local data = { ... } itemSid = data[1] @@ -349,6 +349,7 @@ function RewardItemSingleShowPopup:OnOpen(...) isNoShowSureBtn = data[4] and data[4] or false end function RewardItemSingleShowPopup:OnShow() + isBagPanel = BagManager.isBagPanel this.helpBtn.gameObject:SetActive(false) this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name)) this.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemConfigData.Quantity) @@ -394,12 +395,14 @@ function RewardItemSingleShowPopup:OnShow() then this.btnSureText.text = Language[10193] this.btnSure:SetActive(true) - elseif isBagPanel and (itemConfigData.ItemType == ItemType.GMzck + elseif isBagPanel and func and + (itemConfigData.ItemType == ItemType.GMzck or itemConfigData.ItemType == ItemType.GMBigZck - or itemConfigData.ItemType == ItemType.GMzcq) + or itemConfigData.ItemType == ItemType.GMzcq or itemConfigData.ItemType == ItemType.GMxck - or itemConfigData.ItemType == ItemType.GMxjk - or itemConfigData.ItemType == ItemType.GMxsZcq and func then--是否宝箱可使用 + or itemConfigData.ItemType == ItemType.GMxsZcq + or itemConfigData.ItemType == ItemType.GMxjk) + then this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] elseif isBagPanel and itemConfigData.ItemType == 10 and func then @@ -621,6 +624,7 @@ function this.SendBackResolveReCallBack(drop, curResolveAllItemList) end --界面关闭时调用(用于子类重写) function RewardItemSingleShowPopup:OnClose() + isBagPanel=false PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout = false if this.jumpViewList and #this.jumpViewList > 0 then for i = 1,#this.jumpViewList do From bf32c8e1a77bbb3e092107ba1ab0dad4acda97e5 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 26 Dec 2022 16:23:48 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=9C=88=E5=8D=A1=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/MonthCardManager.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua index a8b01358cc..e2518c46cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua @@ -122,13 +122,13 @@ function this.BackSetMonthCardGetStateData(datas) monthCardData[i].state=1 end end - if datas[i] then - -- monthCardData[i].state=0 - LogError("66666666666") - end - if PlayerManager.serverTime>=monthCardData[i].endingTime then - monthCardData[i].state=0 - end + -- if datas[i] then + -- -- monthCardData[i].state=0 + -- LogError("66666666666") + -- end + -- if PlayerManager.serverTime>=monthCardData[i].endingTime then + -- monthCardData[i].state=0 + -- end end --事件 CheckRedPointStatus(RedPointType.MonthCard) From c48eaa5fbf0e3fe604e8119337acee219c37df0c Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Dec 2022 10:11:37 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E6=8C=82=E6=9C=BA=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Fight/FightAreaRewardPopup.prefab | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab index 8d24b44c5d..6457787966 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab @@ -109,7 +109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000051625524} + m_AnchoredPosition: {x: 0, y: -0.000045776367} m_SizeDelta: {x: 925.1, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2443668873975028990 @@ -333,7 +333,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000004479818, y: -0.000004901922} + m_AnchoredPosition: {x: 0.000004479818, y: -0.000030517578} m_SizeDelta: {x: 924.2, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2775142083553738788 @@ -1906,7 +1906,7 @@ MonoBehaviour: m_Padding: m_Left: 80 m_Right: 0 - m_Top: 93 + m_Top: 100 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: -9.98 @@ -1964,7 +1964,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 4074318518025181697} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -2868,7 +2868,7 @@ MonoBehaviour: m_Padding: m_Left: 80 m_Right: 0 - m_Top: 50 + m_Top: 80 m_Bottom: 60 m_ChildAlignment: 0 m_Spacing: 10 From d122e5f4cb818b57a5de1107257dad08ec3409ef Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 27 Dec 2022 11:04:30 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E7=BA=A2=E5=8C=85=E6=A6=82=E7=8E=87?= =?UTF-8?q?=E5=8F=96=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua index 748ad5e3f3..4a37d659d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua @@ -56,7 +56,7 @@ function this:OnOpen(rewardGroup) itemListPrefab[index] = view index=index+1 view:OnOpen(false,{itemData.itemId,itemData.itemNum},1.15,true,false,false,self.sortingOrder) - local str=string.format("获取概率:%s%%",itemData.weight/ winData[i].allWeight*100) + local str=string.format("获取概率:%s%%",math.modf(itemData.weight/ winData[i].allWeight*100)) view:ResetName(str) end end From 8f057bec7428e1fc2b6e65e9b7135e7e32881afa Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Dec 2022 13:38:33 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E7=99=BB=E9=99=86=E7=95=8C=E9=9D=A2logo?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 1e488955f5..faa3807ac6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -89,7 +89,7 @@ function this:InitComponent() else this.logo.gameObject:SetActive(false) end - + this.logo.gameObject:SetActive(false) -- BindLightFlash(Util.GetGameObject(this.logo, "saoguang"), this.logo) this.healthTip = Util.GetGameObject(this.gameObject, "healthTip") From cc4ba83a7f20eaf50293a703917cff1ee0a07510 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Dec 2022 14:06:10 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E7=99=BB=E9=99=86=E7=95=8C=E9=9D=A2logo?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index faa3807ac6..f7d851ad7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -89,7 +89,7 @@ function this:InitComponent() else this.logo.gameObject:SetActive(false) end - this.logo.gameObject:SetActive(false) + --this.logo.gameObject:SetActive(false) -- BindLightFlash(Util.GetGameObject(this.logo, "saoguang"), this.logo) this.healthTip = Util.GetGameObject(this.gameObject, "healthTip") From c70f8421d3d8b63b0c57ce677807e2ad391372fe Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Dec 2022 14:18:35 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E9=80=8110=E4=B8=87=E7=9C=9F=E5=85=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Operating/GMSong10WanPanel.lua | 89 ++++++++++++------- 1 file changed, 55 insertions(+), 34 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua index b2d2fd7859..2cc0434102 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua @@ -8,6 +8,9 @@ local activityData local allValue=0 local rewardTime=0 local isCanGet=false +local deleteTime=0 +local currShowRed=nil +local rewardNum=0 --初始化组件(用于子类重写) function GMSong10WanPanel:InitComponent() this.spLoader = SpriteLoader.New() @@ -28,7 +31,7 @@ function GMSong10WanPanel:InitComponent() this.scrollView.moveTween.MomentumAmount = 1 this.scrollView.moveTween.Strength = 2 this.itemList={} - + this.timer = nil end --绑定事件(用于子类重写) @@ -42,6 +45,7 @@ function GMSong10WanPanel:BindEvent() UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1,function () isCanGet=false this.getRed:SetActive(false) + deleteTime=0 self:OnShow() end) end) @@ -81,6 +85,7 @@ function GMSong10WanPanel:OnShow() local lastState=-1 local dayList={} if activityData then + local maxId=0 for i = 1,#activityData.mission do local id=activityData.mission[i].missionId if zhenchongConfig[id] then @@ -89,8 +94,6 @@ function GMSong10WanPanel:OnShow() allValue=allValue+aaa.RewardValue if not dayList[aaa.day] then local day={} - --table.insert(missionData,day) - --table.insert(days,aaa.day) day.reward={} table.insert(day.reward,aaa.Reward) dayList[aaa.day]=day @@ -101,6 +104,7 @@ function GMSong10WanPanel:OnShow() dayList[aaa.day].reward.state=state local progress=activityData.mission[i].progress if lastState~=0 and progress>=0 then + maxId=id lineTime=progress if state==0 and rewardTime==0 then rewardTime=aaa.Time @@ -112,14 +116,31 @@ function GMSong10WanPanel:OnShow() lastState=state end end - LogError("#missionData==="..#dayList) - LogError("linetime=="..lineTime) - - + rewardNum=0 + this.timeTxt.text="" this.scrollView:SetData(dayList,function(index, rewardItem) - this:UpdateSingleInfo(rewardItem, dayList[index],index) + this:UpdateSingleInfo(rewardItem, dayList[index],index) end,not false,not false) + this.scrollView:SetIndex(maxId/4) + if deleteTime>0 then + this.timer = Timer.New(function () + --LogError("needTime=="..needTime) + deleteTime= deleteTime-1 + if deleteTime<=0 then + isCanGet=true + this.timeTxt.text = "有可领取奖励" + this.getRed:SetActive(true) + currShowRed:SetActive(true) + this.timer:Stop() + this.timer = nil + else + this.timeTxt.text = string.format("领取倒计时:".."%s",TimeToFelaxible(deleteTime)) + end + end,1,-1,true) + this.timer:Start() + end end + this.getRed:SetActive(isCanGet) this.noGetTxt.text=string.format("未领取:%s元",allValue-activityData.value) end @@ -131,9 +152,14 @@ function this:UpdateSingleInfo(go,data,index) if not this.itemList[go] then this.itemList[go] = {} end + if this.timer then + this.timer:Stop() + this.timer = nil + end for i = 1, #this.itemList[go] do this.itemList[go][i].go.gameObject:SetActive(false) end + for i = 1, #data.reward do if not this.itemList[go][i] then this.itemList[go][i]={} @@ -144,7 +170,6 @@ function this:UpdateSingleInfo(go,data,index) this.itemList[go][i].out=Util.GetGameObject(this.itemList[go][i].go, "guoqi") this.itemList[go][i].name=Util.GetGameObject(this.itemList[go][i].go, "name") this.itemList[go][i].itemView= SubUIManager.Open(SubUIConfig.ItemView,this.itemList[go][i].pos.transform) - end this.itemList[go][i].go.gameObject:SetActive(true) this.itemList[go][i].red:SetActive(false) @@ -160,55 +185,51 @@ function this:UpdateSingleInfo(go,data,index) --LogError("state====="..state) if state==0 then if progress~=-1 then - if this.timer then - this.timer:Stop() - this.timer = nil - end local cha= tonumber(GetTimeStamp()-ActivityGiftManager.loginTime) local needTime=config.Time- (lineTime+cha) - LogError("needTime=="..needTime) this.getRed:SetActive(false) - if needTime>=0 then + if needTime>0 and deleteTime==0 then this.timeTxt.gameObject:SetActive(true) - this.timer = Timer.New(function () - --LogError("needTime=="..needTime) - needTime=needTime-1 - if needTime<=0 then - isCanGet=true - this.timeTxt.text = "有可领取奖励" - this.getRed:SetActive(true) - this.timer:Stop() - this.timer = nil - this.itemList[go][i].red:SetActive(true) - else - this.timeTxt.text = string.format("领取倒计时:".."%s",TimeToFelaxible(needTime)) - end - - end,1,-1,true) - this.timer:Start() - else + deleteTime=needTime + currShowRed=this.itemList[go][i].red + --this.timeTxt.gameObject:SetActive(false) + end + if needTime<=0 then if rewardTime~=0 then isCanGet=true this.itemList[go][i].red:SetActive(true) end - this.timeTxt.gameObject:SetActive(false) end end elseif state==1 then this.itemList[go][i].red:SetActive(true) elseif state==2 then this.itemList[go][i].get:SetActive(true) + rewardNum=rewardNum+1 elseif state==3 then this.itemList[go][i].out:SetActive(true) end end + --LogError("deleteTime==="..deleteTime) end --界面关闭时调用(用于子类重写) function GMSong10WanPanel:OnClose() + if this.timer then + this.timer:Stop() + this.timer = nil + end allValue=0 rewardTime=0 + deleteTime=0 + rewardNum=0 + this.getRed:SetActive(false) + if currShowRed then + currShowRed:SetActive(false) + currShowRed=nil + end + CheckRedPointStatus(RedPointType.song10Wan) end --界面销毁时调用(用于子类重写) @@ -217,6 +238,6 @@ function GMSong10WanPanel:OnDestroy() if this.timer then this.timer:Stop() this.timer = nil - end + end end return GMSong10WanPanel \ No newline at end of file From c1e82cdeac1f98d12167dd909e0a8b0ec177ecc5 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Dec 2022 14:32:01 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E5=8F=AC=E5=94=A4?= =?UTF-8?q?=E8=87=AA=E9=80=89=E7=AE=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 8f7c97c069..29dde1b202 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -43,7 +43,7 @@ function this:BindEvent() end) end) Util.AddClick(this.boxBtn,function() - UIManager.OpenPanel(UIName.RewardBoxPanel,nil,81185) + UIManager.OpenPanel(UIName.RewardBoxPanel,nil,81182) end) end From 5a9de1f434bac18cc81237ef084a976e9e323a04 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Dec 2022 15:44:08 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/PlayerManager.lua | 1 + .../Modules/linglongbaojing/LingLongBaoJingManager.lua | 9 +++++++++ .../Modules/linglongbaojing/LingLongBaoJingPanel.lua | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 6d6d20121c..4303b965bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -110,6 +110,7 @@ function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五 PlayerPrefs.SetInt(PlayerManager.uid.."piaomiaozhilv", 0) PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen,0) PlayerPrefs.SetInt(PlayerManager.uid.."kaifuchongbang",0) + PlayerPrefs.SetInt(PlayerManager.uid.."lingShouBaoGe",0) end if var == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua index 7c4e1fd0d1..3760c01b7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingManager.lua @@ -106,12 +106,21 @@ function this.CheckRedPointLingLong() if not id or id < 1 then return false end + local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,117) local strs = string.split(config.Value,"|") local costId = tonumber(strs[1]) if BagManager.GetItemCountById(costId) > 0 then return true end + local state=PlayerPrefs.GetInt(PlayerManager.uid.."lingShouBaoGe") + if state==0 then + return true + end + local isBuy=OperatingManager.IsBuyGift(20017) + if not isBuy then + return true + end local actconfigs = ActivityGiftManager.GetActivityInfoByType(id) for i = 1,#actconfigs.mission do local config = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,actconfigs.mission[i].missionId) diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index 7e0195fae6..e55e0b5472 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -93,6 +93,7 @@ function LingLongBaoJingPanel:InitComponent(gameObject) -- 奖励预览 self.btnPreview = Util.GetGameObject(self.gameObject, "button/previewBtn") self.shopBtn = Util.GetGameObject(self.gameObject, "button/shopBtn") + self.shopRed = Util.GetGameObject(self.gameObject, "button/shopBtn/red") self.helpBtn = Util.GetGameObject(self.luckyTurnPanel,"button/helpBtn") self.helpPosition = Util.GetGameObject(self.luckyTurnPanel,"BG/helpPos"):GetComponent("RectTransform").localPosition @@ -154,6 +155,7 @@ function LingLongBaoJingPanel:BindEvent() Util.AddClick(self.shopBtn, function() JumpManager.GoJump(40036) + PlayerPrefs.SetInt(PlayerManager.uid.."lingShouBaoGe",1) end) Util.AddClick(self.skip, function() @@ -285,6 +287,8 @@ function LingLongBaoJingPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.RefreshProgress1,self) end + + --界面打开时调用(用于子类重写) function LingLongBaoJingPanel:OnOpen(_activityConfig,_index,parent) self.actConfig = _activityConfig @@ -318,7 +322,7 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder) end end self.turnEffect = Timer.New() - + self.shopRed:SetActive(PlayerPrefs.GetInt(PlayerManager.uid.."lingShouBaoGe")==0 or not OperatingManager.IsBuyGift(20017)) self:RefreshTreasureType() self:DelayMaskWithTime(0.5) self:SetPropShow() @@ -336,6 +340,7 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder) self.shopBtn:SetActive(not not act) end + function LingLongBaoJingPanel:SetLayer() self.firstLayer.overrideSorting = true self.firstLayer.sortingOrder = self.sortingOrder From c9eb00de9ecfde66679c9e8d592627c17668bb53 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Dec 2022 15:55:20 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E7=B2=BE=E7=82=BC=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index e4ea2949bb..9c09d15e68 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -388,10 +388,9 @@ function RewardTalismanSingleShowPopup2:SetSkillShow(_infos,_preList,_grid,_lv) local index=1 for key, value in pairs(_infos) do local obj=_preList[index] - LogError("key===="..key) local proper=passiveSkillConfig[value.id] local str="" - if value.lv<_lv then + if value.lv<=_lv then str=""..proper.Desc.." (精炼"..value.lv.."级解锁)".."" else str=""..proper.Desc.." (精炼"..value.lv.."级解锁)"..""