From 08395ab82dd4946b1ffb56a7e6d40612ba448308 Mon Sep 17 00:00:00 2001 From: Laurids Jeppe Date: Wed, 7 Oct 2020 11:38:56 +0200 Subject: [PATCH] Update to 2019.4.11 --- .../GWConquest/Scripts/UI/BattleArmyPanel.cs | 7 ++++- .../PhotonBolt/assemblies/bolt.user.dll | Bin 42496 -> 42496 bytes .../PhotonBolt/assemblies/bolt.user.dll.mdb | Bin 17355 -> 17411 bytes Packages/manifest.json | 2 +- Packages/packages-lock.json | 5 ++-- ProjectSettings/ProjectSettings.asset | 28 ++++++++---------- ProjectSettings/ProjectVersion.txt | 4 +-- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs index d467239..3bbaada 100644 --- a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs +++ b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs @@ -22,7 +22,12 @@ namespace GWConquest { if(IsOwnPlayer) { - return Battle.FormationList.Where(e => e.GetComponent().Player == Player.CurrentPlayer ); + return Battle.FormationList.Select((e,i) => e.GetComponent()).Where(f => f.Player == Player.CurrentPlayer ); + + } + + else { + return Battle.FormationList.Select((e,i) => e.GetComponent()).Where(f => f.Player != Player.CurrentPlayer ); } } diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll index b568d511a64156c7dde3cc0c9c9d596fd8a88eb7..c8ec80b6d3f7d1161dfdc3a1f8f0660db3e1f1ed 100644 GIT binary patch delta 80 zcmZoT!_;twX~Pj0fqEW>g8X&{2Ch081_qX*otv+?I0j5Mo?0yE%8bdg0fc4r(@#dRDX%xYTwqtA z2LZu>ksbQS_3IzmE9&!piIE+8Cl2^3vT>*2KD|HtJg)zM$o6rc_Kl40(`!Iv@3;Y9 z_UZRY<(U567x%887CX54`izDr2lZPrVJQTz7m(=#q+ zfRm`bYG#~0JS{e%T}s-D-itrKB(<{N*Qoye<35e<^;Kf;_&!cTzj7^7HsO;#!+yM; z{#VGBzMZAszYiT77oW(%O6=3yNrE$J9yg6|o~9O#4QuIjGkx>FJ0fxMQPKUKL|qc~ z^|vQWri@EjG;MO?*2P7||KD|cfU}^bVwd-t-(ykH@0x$=(%SR+&r&V>K|hV^>n!A^ zE93h2trB>mRI$S=x2;|}L>Q0^HiJkG5u=F7I$lLQy#4&0{fJKIYtHNJ$Edq&lzYbe zM$70mdj*j;7^9%60?sdITIDh#o zd0fr;%GRjWpugG6Y&I7SaCOaNHtL_5WR!WPS?y98C9$uX_@r4*nNMTBFLB?YIwf;i zd*&xzPn694-k$l9Sq8gIc2P6?Wy*ZSMbcc3VrDaQ^>=6fD$_pSb&u1Wm z&sFxj9>C0I=HPc{{w!1G8?N%F>qs{>a~qv^gr7f0yGU+hPJ@1jo9uMkWp(*S{S`O4 z>UK@rx}(nf6U&(~>NDKrk=tX$t_Jr){*mjBy|9u4d`3^B!Ysx71yhx&N#= zu{wjNUZ=zCPIhAnjuhvXRWY2T`%Q>Yq$Lw;gV$e&`&dG4pnTPh+rIJkFEa8LhI z{$9+EkKQHy{Js3WB1rS0(c8$&!)SElryjrFDV2>p4f@~Q<)!=ITCeBobl!o=&XzQK z8T8LQP&c^ zTVCXTsae;s^bPD&VR9asl4oijHBmaYIv3XDk+pf&Y1Unx&fum^h9h|-EzeO*gVV`i znFW99GEaj-&St?|hQ8C0ZyWA+^T;5t!Cq>gXX+h?d%Bn0^17{=b1?10eW@P%-1B~= z<=>$Mun+gGc_k%pYToy!w+;8*4*8u8_fIno_w#w>Zr)c!w^pyCN@IuNzA>L{%C|XR zwv(T5NbY>NbBWC~*U#jWTlrp)!Pm0K z$?igXu-}*4HW98mB+uShyk1D278+hy?Z7?DzWXxlEKAMZg=J6Sy|~%T|Ii`7vx!LI zcUWv*FDy?B4=~_+ygS@zFb5yiVQBQ<{p_tIp^Abrxcac zqT6t@nR|@V+;-BP?RVy7--V)bujp$n_tea}Hx-l3#kLg7cJ3MP$(_0Qohc@_ioGDZ zwe~Ebv19F7S6tQ?-%#9QE4AljaXD4|wDoUl&o6AQ)}G&s%Z=hUH7g0rMIE|E{hQ)4 zu*9GeYM%ADYVDa*LVheUSF<+f&>6h7EA7S-vZ=&oOq0_qt!>$vLs@+Wh*2RP8Yqj< zBRSq)kg^sc+v>Efc7^u)C^)R2e+B<=|3ZHLf!ZH|*{fKND_8rK+(D_OEz5@1l6IFf?}2{(3aA&wRDQrRz|`3(sH5nMQ!snY_5)iJEi4r z>3f>B5zFO{b_E(%MuwLeQAX`X3a&Z|7L<{NWfoy&zR2kGuAI|qAM>lK-gZA*W0X#( ztNX2TmbV*q`AY@4`1$#Va! zT$yyTa6_tu)Y(FQw~UZOb+aw^scA-K=!AuZ^>?_Ibq(>J>2G+YMsMkr>6RtSwad+H z_8_12gf9G0e)(|ghw4t>WT)--C)0gohR;kN)x3>qKcVYr`r|%w z!sn!B4K;B>9qv!=`^W>IhuH5cSk?vG2&MTu7i?MYPsWy&Ib~OtRr~#e53?v}rYo6X!w@5!C{LN&62%&4%uf|`39jjdC)uw|;= ztRU$XZdq+*st)s&;l3k$)y;RYxjI#+_{vn@X_~bkOCMstH(Kp0NxsRNeFR&bt7*P+ z)c2TX9XB~XD7fP*cYW_+zW+hN71P^mwEcF;>GIK9!n0YAwKb&k!mB)Juujzx6=h+? zMHSVfHO1^WRd-gBU6poMQqAd@_NjWMl3cBHO*6NcZBw;^LI0|fysq>{vr=j2u$-J; zS!Pt8S^52=#X3{BE3MzLoXk8})>oFjmCq8~dQCiJN$tzHu&m}LRguY6rc`-LvaS+N}o$jYj+s_JU&Y)+zU z4t;Z8K(an$I9yeJtD2#8;C_}4tg0rft0nP#E1Mn2cy9-KXSwY=QcW&bdqf870eYFG z1FQWc$uHS2+Z}lQ-VSIb)OORI<|kMD9+Sb^fl)4;f&=#FJW2kN?7znU{T=8x!gARh ztF*Tb%>zMR$1Tr!zIJ@VtKIe6YWPuqx$6If4Au_JB!IP+m9W&ZGpoz2>a(kB3j%9T zR=8O2e}i1w`tc0ZXn6+eVXW+C(66g5Db-VH@NXBSdt8*~L1Dp}Ru#58H{f%ut zFy=QaOHzaWe4tznyrV@wNc2)l=!QlQo_`0))SziWYU(uAj8n|yAXyW%Rx?jvR!~|t zP|UO-IU00KGta1ItYY2^lKVjqH1mQQwwz*)sx6~ykEyNZysVl{6?1WISyFo`rn4Qr zmUTx5IPU1q+H#=w2`%n@HEysH_jPS~Q+r??HED)w#w+HmIx@S?9L;=!Y1vWBA=+3+ zHr3gznSZLLdM8smo#e}mdj)1JXtRBf7X@1>ORxlA8^&m zH@TinsW-Kr+J&iZj*t9S)sxlrk}xyhjj8YUSnjarx!G24w)c6|TIFSbzvrJ1`LYzA zto2EGKj%wTE^>T{#M+^nCDX}i1QC|D*+&cez> zImoubfnE*$lquNIXe>~$Sdc+KxPgprFsXqW@RXaaVpTTi*Ef(24K`}lS=u{RtYZ!2 zc!LwzZ>?AtI6`l)SQ!oE?*_vfs+oUR!rLp>>V}fkFd5fLbZf;*SE4(uSVtPl`G(iE z$Qepxhl({iSjGg84Sq-HCraqIR;*>gvMxB4_SS;iSi9UWnb2gSW*x?Ic$Z>X6ZyHxa?L%C ztCp<2O=Mq_{hD>!-LYg{Ya-X1{EqpKl695yVR@J0?Ip`E%gXBA1&ea^rin~xI<={~ zqeDF$%hg{^pXxf~`} z!mc_GZ>?90mGEyZDzC$2bn{8g)$psbgimcQ+nWE1{nm1r{MPWw^6*k~x!wG+7Jf6~ z0|NtXtE`yM1}QabP7C?5#oQKZ7gE`#ka8uhqYVG;Eo4WFotT;Dd6U-4rDccG+i<@i zP}^46lwn5OE=D)64~%(=mR2Wzab;EZTMN0-;=wFi*^#$b$K@?0x#gCYY9}v} z*|MOsO#PcJCB5Y>&Ag(TmZ?9al?-h)td-jGcT9VA{Hc}9Yc*dpZ>grGI;OOe)K=Rx z^PU>kQXS8?k_)XaYG#INTB_q;t>js&=bHHh({f1bDu;A(Ynjq|YHR0*^iMW*en`We z9@3=Nva$8{e+080(jlH%4r!)3{JOOaYcsx$dSJ$T+779u4sU8Bo7-&B%BQioTxm6dH*Y33Z&wAA4P zZRKFwLz=k|)3FYxx0PFMZ(D7p4i9f9BifB@rzTp)=4u_D+D@jmo32?au^gV&C$*F0 zc55_u4X#>;)7r_=cE>bpgQsI1zSBazow6|s+nlp11 zzR^)`c1(93-dcr6Lj~6?ZJL)6`u6g@XEdJ^-l7z z(=#pnEW+EXaQ8mnQiKrLo%dlnE5Zwu&N?l^owbV5 z-nz`R6yfWg(biU}->bXGhAzK$Q9GGJW=j#aEHv+Sk$YY4 zYvy*RaxgebeWC|nkYFVW2Xs@X#^cZAE%@LigDSPko|n3u!l zO88aHJf@n>74z?Kc@_RzGf!gLuWK_RWM;&y2MgYFNv4ExD_#>AF@kU#q6&x|Y^ej&?n!nZx)DueAu5 zwk(G4b(Q;FA6RXr2#@I|W4n#(rY0KA=4uh1)lFu1o1g z552V);lbTyNcW-LRdYY4y$H|kEVR5u9iC${`o0Vj`7GZs~ zY>3{d8Mn0vY0+{t`j|b!t!TL&eMj3cBbQEJ+g)GJT_57EZ|P2s50sbwS+qQleqq}z zhexD$I3I6t{9(%)g^gaBe+)V1#>h`G^J1(=FNdd>-)J_h71XMGjx#ZGHs+koF}la_ z!YZ!3jE`dEam*8&XEN|1u@hpg5lw~|op&?EYoU0{V&&)9<(kJs zGsP-zHkx+F%AVN0s^bx1dEphYzD$>6T)i>m|w|o;T1LFq8srhp1GB-8Nh?ALd zvoyb`z2&Aj*&Me;a|$XgZ7EGB;^bu9Da|WwZ}l)vGU6U-PATQxgCeF;@iIDoOuX6) zU;FlREY>8ZP4Tihev9V#+uNLomy_|QG^eV)&HZ?J5dTnfg6wTZ^pKG~ zM)gp8P}AOKUJseyV}a%b+uLmEAzOQ-Xij~5n^QgHbdNKd6J~Gou!m&yc%(T^>}^IR z$moPI32G18+uJNikcA10G^aIfv?HC8AgKx4G%wQL>Rf`HPq?5tUF?~jB*@c*KWvWK zBf?CCnPFm$C%hVHts*ls>+e$m9KUZZI%^MypYn0QI^ymelIisu*5y0iJOM0u9@T=Vj3UYl_9 zq@FUl=aimGZZVbQdnFHu&VQyF=*ocqOl|lT0{G5}sW;pWC|^D~0M7z^3&oTUp8d84U|Cdg4ctR z=&SHCPzv3Z17-lF(O<(oK^gQkcm(i8C&LRtMf5Rv8>oc#;{d-#S4Ou+*8^41E8+iw zs_4V;7Eldcg_H0S%~$12)M}{>_!fn!8yo@nhMegu_!Gbf+f38o;ou{5GQ1GfK&Qdm z0AHgs_2gteLf1l%Kz|7W(F@_ppfP$IoCKPnFTsaEQ*u8(?KV+Hv>=)I-@JYB|sN+7#sw`(RCP@gV7P_aC9>eiT)Dq0lJ}ofQN#Q z(Mj-J&>hWZ`y~}bp|8M~Ks5R#d>_Q13o_VUKrA`{_5pF|nQ#J#N9SY`q@a7CebI$M z0=fxY6MTk_fjfYH=)rJb&>wvrUIhlA^-Q1)^ylbUbXD+$vOWA6_!4~uUJWQ>rq}R& z@D)0e30Dz(js6Bs1mB>?z$3x8=*94K@Ev+LyaxOieFZ)a{)c`A-v$fvMGBCtx*tDLfq{p?AaU zKr;Fod>pJnzkwfuwdf)gOAoLPT?;M`)}sf&?ZF20_wXRF5xo-r5o|&qg!zoJY)0RL z&nkbTjTGHK&|A@^&|V+~-2kovQqgVTmS7vY7u*f}iXIJr1-7FX!PCGF^bR-~>_pcs zA;JfbWfwXE9R_xz{{tt0J?LNH$zUIPFT4rtN8f}`f&*xulKcV(p%B;~96}F-W5Hqc zTzDKfg1!uI18HbODUo~Vqv*QmV&E7$0uBSm(f@%HzzOseco;Z|PKM`$Q|L5!8#s-= z2VVqd&}Bv> zlo8Q^E9l~I9&i<12d)UNp*zFPz;*QJa2)s@eIK3%ZlK*h6nTNZi7tyS0MgMBa4@)y z{sK+_chFPdA>c0h6ub`HLqCPDf&1tHAJz`w0lFRB06aubg8PFEG#`+apTHwDpNN%R z;4!*nS++$#K}Vu%gQw`P;6(5TdMZ2|{E1!zF93g`kHWu#XJ|glDwn`>v|Bm$5&Z&P z7F__mL=S))g1^yxC{-qaSLj3VR`42q8$Ji#piSk;i58uhN~662-?TKg{H1> z3t&Kh3-<&$(0uw-Mgb#w2|NRs(7WNaz>K~E9|tbzSMYt{itb;5br5hvPlN{ock~K) z4)8!8}0_mpvS=9fDh42VLr7fKIq->I#3pU z4L%Oap>j|bR66XR6-Ai`+>^nXYfK$1)Z-d=Nwc; z`@y9^HFP}O67auFFns~{2LWh4VJSmEb@WnrHuwm=9bN}&pwGicKuz==I33hN8>%r6 z(1GY8=-eO(T@fx1YNJEpTA&WP8{8JuMfZk30rk*R;BP>E^kH~DXn;npQ zJ_|aa-@uPSM|8me@`6rif7l0fMz@0NgD&VqI1+@ThrnNe2=p>|B8WuuaY#u8UD5a9 z-#|CCYjx@q`eXEm==?xOsp$*!U=J_==8fclzl4qOS=aQ#R&ia literal 17355 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 diff --git a/Packages/manifest.json b/Packages/manifest.json index 27a8fb6..7f1f6ae 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.ide.rider": "1.1.4", "com.unity.ide.vscode": "1.2.1", "com.unity.postprocessing": "2.3.0", - "com.unity.test-framework": "1.1.14", + "com.unity.test-framework": "1.1.16", "com.unity.timeline": "1.2.10", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 579521b..100643d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -53,7 +53,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.14", + "version": "1.1.16", "depth": 0, "source": "registry", "dependencies": { @@ -75,7 +75,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.modules.ui": "1.0.0" + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" } }, "com.unity.modules.ai": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e0a7834..824915f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -103,6 +103,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -110,8 +111,13 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -189,22 +195,6 @@ PlayerSettings: uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -526,6 +516,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -551,6 +542,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -567,6 +559,8 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -606,6 +600,7 @@ PlayerSettings: 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 29: UNITY_POST_PROCESSING_STACK_V2 + 30: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} @@ -671,6 +666,7 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 291a748..d53ff41 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.5f1 -m_EditorVersionWithRevision: 2019.4.5f1 (81610f64359c) +m_EditorVersion: 2019.4.11f1 +m_EditorVersionWithRevision: 2019.4.11f1 (2d9804dddde7)