Merge pull request #7276 from minggo/v3

fix compiling error
[ci skip]
fix effect of spine
Merge pull request #7278 from minggo/v3

fix effect of spine