Assets/Resources · 84868f75864378862f39158395370c13b75f1f9a · shujianhe / tuseGameColor

Merge branch 'master' of gitlab.huolea.com:shujianhe/tusegamecolor · 1e59b00d
maxiaoliang authored Jul 06, 2023
```
# Conflicts:
#	Logs/shadercompiler-UnityShaderCompiler.exe0.log
#	UserSettings/Layouts/default-2022.dwlt
```
1e59b00d

Name	Last commit	Last update
..
Materials		Loading commit data...
animations		Loading commit data...
fonts		Loading commit data...
home		Loading commit data...
perfabs		Loading commit data...
scenes		Loading commit data...
sharders		Loading commit data...
temps		Loading commit data...
0.png		Loading commit data...
0.png.meta		Loading commit data...
1.png		Loading commit data...
1.png.meta		Loading commit data...
10.png		Loading commit data...
10.png.meta		Loading commit data...
11.png		Loading commit data...
11.png.meta		Loading commit data...
12.png		Loading commit data...
12.png.meta		Loading commit data...
13.png		Loading commit data...
13.png.meta		Loading commit data...
14.png		Loading commit data...
14.png.meta		Loading commit data...
15.png		Loading commit data...
15.png.meta		Loading commit data...
16.png		Loading commit data...
16.png.meta		Loading commit data...
17.png		Loading commit data...
17.png.meta		Loading commit data...
18.png		Loading commit data...
18.png.meta		Loading commit data...
19.png		Loading commit data...
19.png.meta		Loading commit data...
2.png		Loading commit data...
2.png.meta		Loading commit data...
20.png		Loading commit data...
20.png.meta		Loading commit data...
3.png		Loading commit data...
3.png.meta		Loading commit data...
4.png		Loading commit data...
4.png.meta		Loading commit data...
5.png		Loading commit data...
5.png.meta		Loading commit data...
500X680.png		Loading commit data...
500X680.png.meta		Loading commit data...
500X680_wd.png		Loading commit data...
500X680_wd.png.meta		Loading commit data...
500X680c.png		Loading commit data...
500X680c.png.meta		Loading commit data...
6.png		Loading commit data...
6.png.meta		Loading commit data...
60cc794456d373000121d841foreg 1.png		Loading commit data...
60cc794456d373000121d841foreg 1.png.meta		Loading commit data...
60cc794456d373000121d841foreg.png		Loading commit data...
60cc794456d373000121d841foreg.png.meta		Loading commit data...
7.png		Loading commit data...
7.png.meta		Loading commit data...
8.png		Loading commit data...
8.png.meta		Loading commit data...
9.png		Loading commit data...
9.png.meta		Loading commit data...
Daily_effect.atlas		Loading commit data...
Daily_effect.atlas.meta		Loading commit data...
Daily_effect.json		Loading commit data...
Daily_effect.json.meta		Loading commit data...
Daily_effect.png		Loading commit data...
Daily_effect.png.meta		Loading commit data...
Materials.meta		Loading commit data...
animations.meta		Loading commit data...
bar_base.png		Loading commit data...
bar_base.png.meta		Loading commit data...
btns.plist		Loading commit data...
btns.plist.meta		Loading commit data...
btns.png		Loading commit data...
btns.png.meta		Loading commit data...
fonts.meta		Loading commit data...
home.meta		Loading commit data...
ic_launcher.png		Loading commit data...
ic_launcher.png.meta		Loading commit data...
icon.png		Loading commit data...
icon.png.meta		Loading commit data...
iconmonstr-cut-filled.svg		Loading commit data...
iconmonstr-cut-filled.svg.meta		Loading commit data...
jinduhuan.png		Loading commit data...
jinduhuan.png.meta		Loading commit data...
leidianjiangjun.jpeg		Loading commit data...
leidianjiangjun.jpeg.meta		Loading commit data...
null.png		Loading commit data...
null.png.meta		Loading commit data...
perfabs.meta		Loading commit data...
scenes.meta		Loading commit data...
sharders.meta		Loading commit data...
temp01.png		Loading commit data...
temp01.png.meta		Loading commit data...
temp_500X680_wd.png		Loading commit data...
temp_500X680_wd.png.meta		Loading commit data...
temp_500X680c.png		Loading commit data...
temp_500X680c.png.meta		Loading commit data...
temps.meta		Loading commit data...
tuseok 1.png		Loading commit data...
tuseok 1.png.meta		Loading commit data...
tuseok.png		Loading commit data...
tuseok.png.meta		Loading commit data...
uTools_1685963731752.png		Loading commit data...
uTools_1685963731752.png.meta		Loading commit data...
undraw_love_it_uy8k.svg		Loading commit data...
undraw_love_it_uy8k.svg.meta		Loading commit data...
zhang_out_4.png		Loading commit data...
zhang_out_4.png.meta		Loading commit data...