# Conflicts: # wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml # wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes |
||
|---|---|---|
| lua_probject | ||
| wb_new_ui | ||
| wb_unity_pro | ||
| .gitignore | ||
# Conflicts: # wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml # wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes |
||
|---|---|---|
| lua_probject | ||
| wb_new_ui | ||
| wb_unity_pro | ||
| .gitignore | ||