# Conflicts: # wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes |
||
|---|---|---|
| .. | ||
| assets | ||
| plugins | ||
| settings | ||
| .gitignore | ||
| wb_new_ui.fairy | ||
# Conflicts: # wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes |
||
|---|---|---|
| .. | ||
| assets | ||
| plugins | ||
| settings | ||
| .gitignore | ||
| wb_new_ui.fairy | ||