测试
修改支付接口无法调用问题
修改.gitignore
保存
Merge branch 'shenvsv-master'

Conflicts:
	CaptureActivity/.DS_Store
	UserDefault.xml
	WanpuPayLib/bin/wanpupaylib.jar
	debug.log
	proj.android/.DS_Store
	proj.android/assets/scripts/app/nodes/BuyWindow.lua
	proj.android/assets/scripts/app/nodes/Dialog.lua
	proj.android/assets/scripts/app/nodes/Info.lua
	proj.android/assets/scripts/app/scenes/MainScene.lua
	proj.android/assets/scripts/app/tools/pay.lua
	proj.android/assets/scripts/app/tools/qr.lua
	proj.android/assets/scripts/lib/one.lua
	proj.android/build/apk/proj.android-debug-unaligned.apk
	proj.android/build/assets/debug/scripts/app/scenes/MainScene.lua
	proj.android/build/assets/debug/scripts/app/tools/pay.lua
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$1$1.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$1$2.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$1.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$2.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$3.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$4.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$5$1$1.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$5$1.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee$5.class
	proj.android/build/classes/debug/prime/bacoo/gamee/Gamee.class
	proj.android/build/dex/debug/classes.dex
	proj.android/build/incremental/mergeAssets/debug/merger.xml
	proj.android/build/libs/proj.android-debug.ap_
	proj.android/libs/armeabi/libgame.so
	proj.android/obj/local/armeabi/libgame.so
	scripts/app/scenes/MainScene.lua