汤姆猫学英语

修订 1e3999aa

Merge branch 'develop_2.1.4' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into develop_native

1. Conflicts:
2. .gitignore
3. assets/Scene/TeachScene.fire
4. assets/Scene/scene_cardbox.fire
5. assets/Scene/scene_map.fire
6. assets/Scene/scene_patriarch.fire
7. assets/Scene/scene_store.fire
8. assets/Script/Armature/ArmatureBase.ts
9. assets/Script/UI/CoursesUI/CoursesMenu.ts
10. assets/Script/UI/CoursesUI/lessonIntro.ts
11. assets/fxm_prefab/patriarch_set.prefab
12. assets/fxm_texture/ui/login/title_1.png
13. assets/fxm_texture/ui/login/title_1.png.meta
14. assets/fxm_texture/ui/store/store/beizhu_1.png
15. assets/fxm_texture/ui/store/store/beizhu_1.png.meta
16. assets/resources/res/courses/action_config.csv
17. assets/resources/res/courses/item_config.csv
18. assets/resources/res/courses/scene_config.csv
19. build/jsb-default/frameworks/runtime-src/proj.android-studio/app/RunFoxEnglish.iml
20. build/jsb-default/frameworks/runtime-src/proj.android-studio/gradle.properties
21. build/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist
22. tt.js

文件

• 已添加
• 已修改
• 已复制
• 已重命名
• 已删除