Merge branch 'wjc_new' into develop_new

mac

2024-05-29 6666e651e35ef6ae079247da975c58098111c13c

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?> 
<resources> 
 
  <integer name="animation_default_duration">300</integer> 
</resources>