samuele3hu
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +08:00
James Chen
1755e7778f
close #2371 : Updating LuaCocos2d.cpp.
2013-07-04 17:15:48 +08:00
James Chen
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
James Chen
1d941f7c25
issue #2371 : Adding scripting/lua/luajit/mac/libluajit.a
2013-07-04 17:11:13 +08:00
James Chen
686a1021b6
issue #2371 : Updating luajit building script for Mac 64 bit. We need to build a 32bit, 64bit fat library.
2013-07-04 17:08:56 +08:00
James Chen
399a6a9a48
issue #2371 : Updating LuaCocos2d.cpp.
2013-07-04 17:07:56 +08:00
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
minggo
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
samuele3hu
fe8e30c3e0
issue #2243:Add a uniform fund in ScriptEngineProtocol
2013-07-01 15:04:14 +08:00
minggo
7e26a86e2e
issue #2329:not bind CCFileUtils private function
2013-06-26 17:36:31 +08:00
samuele3hu
46bcf6ddba
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle
2013-06-25 15:22:14 +08:00
samuele3hu
3b058fe019
issue #2276 : Add OpenGL lua module
2013-06-25 14:55:57 +08:00
James Chen
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
James Chen
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08:00
James Chen
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08:00
samuele3hu
b9d79293cd
issue #2276 : Modify InitLuaScrollView to initLuaScrollView
2013-06-21 15:46:59 +08:00
samuele3hu
a6d072e679
issue #2276 : Modify LuaScrollView create method
2013-06-21 15:42:39 +08:00
samuele3hu
7d0c073215
issue #2276 : Modify vs2012 solution config
2013-06-21 14:57:17 +08:00
samuele3hu
6d71b41101
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 14:18:26 +08:00
samuele3hu
e36c6f544a
issue #2276 : Modify ScrollView and LuaScrollView class
2013-06-21 14:17:41 +08:00
James Chen
1608f4b286
Adding COCOS2D_DEBUG=1 for liblua project. Adding missing files in liblua project.
2013-06-21 12:07:31 +08:00
samuele3hu
a862543a4c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 10:44:03 +08:00
samuele3hu
c527fecfe3
issue #2276 : Add scrollview sample test in cocosbuilder and modify some config
2013-06-21 10:43:02 +08:00
Sam Clegg
60bfca0e45
[NaCl] Remove missing functions from lua stdlib.
...
NaCl doesn't support tmpfile() or exec() so remove
these from the lua stdlib build when building for NaCl.
2013-06-20 12:56:15 -07:00
Sam Clegg
203d2e4559
Fix compile warnings in LuaOpengl.cpp
2013-06-20 12:56:12 -07:00
samuele3hu
71fe43ee97
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-20 22:40:21 +08:00
samuele3hu
15c69563e2
issue #2276 : Add ScrollView lua binding and test sample
2013-06-20 22:39:30 +08:00
James Chen
de0e683014
Merge pull request #2949 from dumganhar/develop
...
Bug fixes for the tool to generate luabindings.
2013-06-20 05:56:50 -07:00
James Chen
1b66a98390
Bug fixes for the tool to generate luabindings.
2013-06-20 19:00:23 +08:00
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
James Chen
36d82c9384
closed #2129 : Updating LuaCocos2d.cpp.
2013-06-20 15:10:44 +08:00
James Chen
ba1fe39d91
issue #2129 : Removing CC prefix for scripting module.
2013-06-20 14:33:59 +08:00
samuele3hu
fb075d7a7d
issue #2277 : Delete some conflict file and resolve some error
2013-06-20 11:28:16 +08:00
samuele3hu
0c4f99080b
issue #2277 : modify platform config except win32
2013-06-20 10:19:46 +08:00
samuele3hu
b818001007
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
2013-06-19 16:43:15 +08:00
samuele3hu
b48cf5997d
issue #2277 : Add OpenGL lua test samples
2013-06-19 16:40:02 +08:00
James Chen
504a9e714e
issue #2300 : copy --> clone for luabinding.
2013-06-19 12:08:26 +08:00
samuele3hu
778708426c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
2013-06-17 14:38:08 +08:00
samuele3hu
26f1bd5171
issue #2277 : Add OpenGL lua binding
2013-06-17 14:19:00 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
Lee, Jae-Hong
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
James Chen
88b67c7961
[Marmalade] Updating scripting/lua/proj.marmalde/lua.mkf.
2013-06-10 14:56:24 +08:00
James Chen
b0669b4f7d
[Tizen] Updating project configurations.
2013-06-09 18:56:22 +08:00
James Chen
0a8ae1e79f
[BB] Updating project configuration after adding CocoStudio runtime.
2013-06-09 15:29:51 +08:00
samuele3hu
ad0ade46ce
fix issue #2103 : modify AudioEngine module read-only
2013-06-09 11:38:18 +08:00
samuele3hu
bc699c1c1e
issue #2103 modify AudioEngine framework and CocosDenshionTest sample
2013-06-09 10:32:23 +08:00
James Chen
8e29638435
Merge pull request #2821 from samuele3hu/audioEngine
...
Encapsulating SimpleAudioEngine to AudioEngine in lua and updating CocosDenshionTest.lua
2013-06-08 02:59:30 -07:00
James Chen
32609aeeef
Merge pull request #2824 from edwardzhou/master
...
Cast variables to their own type, and print warning info if no corresponding lua callback function instead of crash
2013-06-08 00:01:55 -07:00
samuele3hu
836bfe1d3f
issue #2103 modify audioEngine table name to AudioEngine
2013-06-08 14:06:19 +08:00
Edward Zhou
00629f6cb9
1) cast variables to their own type; 2) print warning info if no corresponding lua callback function instead of crash;
2013-06-08 13:28:06 +08:00
samuele3hu
34b4cb48ab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine
2013-06-08 11:25:51 +08:00
samuele3hu
4be415cc04
issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua
2013-06-08 11:23:21 +08:00
James Chen
007a33f89a
Merge pull request #2809 from edwardzhou/master
...
issue #2103 : correct the type detecting order for Lua CCBProxy::getNodeTypeName.
2013-06-07 19:37:19 -07:00
James Chen
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
Edward Zhou
9cc351f47b
correct the type detecting order forgetNodeTypeName
2013-06-07 19:49:22 +08:00
James Chen
43e8573d8b
Merge pull request #2807 from dumganhar/master
...
[BB] Updating project configuration.
2013-06-07 03:49:10 -07:00
James Chen
3fc675a6df
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
2013-06-07 18:38:00 +08:00
James Chen
fc2c068a66
[BB] Updating project configuration.
2013-06-07 18:17:07 +08:00
samuele3hu
50f44db9a8
issue #2103 add webSocket lua test sample
2013-06-07 17:02:00 +08:00
James Chen
9298492384
Updating project configuration for Blackberry port.
2013-06-07 16:52:49 +08:00
samuele3hu
16a34b0da3
issue #2103 add webSocket lua test sample
2013-06-07 16:51:50 +08:00
samuele3hu
a2cf4933c4
issue #2103 add webSocket lua test sample
2013-06-07 14:57:36 +08:00
samuele3hu
c021f700d3
issue #2103 add webSocket lua test sample
2013-06-07 12:54:39 +08:00
samuele3hu
5986d3904d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 10:14:12 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
James Chen
8c3b1899bb
Removing unreadable print in CCBReaderLoad.lua.
2013-06-06 14:23:30 +08:00
minggo
cdf09c04ea
issue #2103:make HelloLua & TestLua work on vs2010
2013-06-05 17:43:49 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
samuele3hu
23eec2f1ce
issue #2103 modify some compile setup
2013-06-03 18:14:06 +08:00
samuele3hu
9352b60653
issue #2103 modify some compile setup and del some resource file
2013-06-03 17:40:31 +08:00
samuele3hu
bf1cd2e909
issue #2103 modify some compile setup
2013-06-03 16:56:45 +08:00
samuele3hu
db7a2a1290
issue #2103 modify some compile setup and delete some deprecated lua function
2013-06-03 16:07:06 +08:00
samuele3hu
7101bc4377
issue #2103 remove simple cocosbuilder sample
2013-06-03 14:59:04 +08:00
samuele3hu
afa6b81ba7
issue #2103 add cocosbuilder lua bind and add a simple sample
2013-06-03 13:47:12 +08:00
samuele3hu
0a1c12a2d3
issue #2103 add some overlapping file and delete some comment line
2013-05-24 13:45:06 +08:00
samuele3hu
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
samuele3
5da5407efe
issue #2103 add menu test lua sample
2013-05-23 15:39:41 +08:00
Lee, Jae-Hong
6acd8c66c2
Adding lua libaray and sample projects for Tizen.
2013-05-22 21:45:53 +09:00
James Chen
99664b5998
Merge pull request #2391 from sbc100/log_asserts
...
fixed #2152 : Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
2013-05-13 19:56:28 -07:00
James Gregory
c45e5797cf
Add Makefiles for Emscripten + Emscripten external
2013-05-06 20:58:02 -07:00
Sam Clegg
4f6de1bcad
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
...
Also remove the first "cond" argument, since it is always false.
2013-05-06 12:25:13 -07:00
James Chen
c70d9f203a
Don't export classes in scripting/lua/cocos2dx_support.
2013-04-27 18:24:08 +08:00
James Chen
91036225c3
[Lua] Fixing "memset" and "memcpy" can't be found on BB port.
2013-04-27 14:45:00 +08:00
James Chen
eb0358fda6
[Lua] Passing full path to luaL_dofile in CCLuaEngine::executeScriptFile.
2013-04-27 14:44:20 +08:00
James Chen
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
James Chen
8c779ff98f
Fixing compilation errors for linux port.
2013-04-27 09:32:46 +08:00
minggo
89591fdccc
fixed #2084:add lua loader for all platforms
2013-04-26 12:12:19 +08:00
James Chen
862ce85c7a
fixed #2083 : Bytecode of LuaJIT can't work on android.
2013-04-25 21:29:31 +08:00
James Chen
a005852fa5
issue #1847 : Using luajit for win32.
2013-04-17 10:46:38 +08:00
James Chen
2384d97ce8
issue #1847 : Adding luajit library for win32.
2013-04-17 10:09:17 +08:00
James Chen
4a7bacf0b5
Updating Android.mk.
2013-04-16 18:19:46 +08:00
James Chen
bbbf139c8d
Adding luajit iOS prebuilt library.
2013-04-16 18:19:25 +08:00
James Chen
79d58bcdb9
issue #1847 : Adding sources of Luajit2.0.1-hotfix, and adding android support.
2013-04-16 17:34:58 +08:00
James Chen
0ecf9da3a6
Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg.
2013-04-12 14:27:29 +08:00
James Chen
0bab4609ab
fixed #1592 : Removing some marco definitions in CCTexture2D.pkg.
2013-04-08 14:14:35 +08:00
James Chen
1a44f776f8
fixed #2005 : Adding CurrentLanguageTest for Testlua.
2013-04-07 16:34:07 +08:00
James Chen
85b0fd306a
Adding CocosDenshionTest.
2013-04-06 14:32:46 +08:00
James Chen
e754909c5f
Adding RenderTexture test for TestLua.
2013-04-05 17:13:46 +08:00
James Chen
2bff6d6480
Adding Texture2dTest. And format some lua codes.
2013-04-05 16:13:04 +08:00
James Chen
818a570b7f
fixed #1998 : Adding SceneTest.lua for TestLua.
2013-04-03 18:14:03 +08:00
James Chen
2d9f8ca8de
fixed #1814 : MenuTest for Testlua is ok.
2013-04-03 16:29:16 +08:00
James Chen
2de4dde0bd
Merge pull request #2293 from dumganhar/iss1942-layertest
...
fixed #1942 : LayerTest for TestLua is ok.
2013-04-02 02:54:21 -07:00
James Chen
a73395507c
fixed #1942 : LayerTest for TestLua is ok.
2013-04-02 17:52:08 +08:00
Deniz Piri
c73a6e3b14
LUA: print() function should use CCLOG internally.
...
CCLOG uses __android_log_print internally, this allows lua's print() function
to print to android log output and allows developer to see print output from
LUA using "adb logcat".
2013-04-01 19:16:43 +02:00
James Chen
5fd2acca47
Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding.
2013-04-01 17:39:26 +08:00
flamingo
4a313e0ffe
Update CCLuaEngine.cpp
...
Null pointer check in order to prevent crashes.
2013-03-26 00:24:47 +04:00
James Chen
196ff7228d
Updating CCLabelBMFont.pkg.
2013-03-20 16:05:45 +08:00
James Chen
f57a751a48
fixed #1837 : Refactoring schedule binding codes.
...
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 15:29:53 +08:00
minggo
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
Sam Clegg
c0b150c859
Cleanup the tolua++ bindings build system.
...
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.
Update README file with current instructions.
Re-generate output file using new build system.
Add build.sh and build.bat for building on POSIX and
win32 respectively.
2013-03-08 11:09:10 -08:00
wangshuai
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
minggo
44857e5137
Merge pull request #2093 from sbc100/linux_build_system
...
Linux build system
2013-03-06 19:09:49 -08:00
Sam Clegg
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
Sam Clegg
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
wangshuai
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
Sam Clegg
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
wangshuai
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
Sam Clegg
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
wangshuai
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
wangshuai
b4e13af460
issue #1425 :
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
...
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
giginet
70612a722b
Fix CCRepeat#create is recieved bad argument on Lua binding.
...
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
2013-02-22 20:24:22 +09:00
James Chen
ab00de629a
Removed the definition of the touch event type .
2013-02-20 12:06:12 +08:00
minggo
1b743b37c9
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-19 10:08:25 +08:00
minggo
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
James Chen
8c261c1789
issue #1770 : Updating linux makefile.
2013-02-06 15:59:29 +08:00
James Chen
c42ef7e44a
Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support
...
issue #1687 : Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
2013-02-04 18:59:49 -08:00
James Chen
4506214cef
issue #1689 : Adding some missing files.
2013-02-04 15:01:44 +08:00
minggo
07cd6d2bb2
issue #1689:modify lua samples to make them work correctly
2013-02-04 14:50:45 +08:00
dualface
5904512ac6
add CCFileUtils Lua support
2013-02-04 12:41:24 +08:00
minggo
a771bc8183
issue #1689:modify lua Android.mk
2013-02-04 12:02:21 +08:00
minggo
744bfb3cb2
Merge pull request #1945 from dualface/add_CCLuaObjcBridge
...
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
dualface
74e497bb2b
restore CCLuaEngine missed methods
2013-02-04 11:28:09 +08:00
dualface
7839ceb45b
add CCLuaObjcBridge
2013-02-02 02:05:52 +08:00
James Chen
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
James Chen
c80d438110
issue #1683 : Exporting `fullPathForFilename` to Lua.
2013-01-27 20:26:04 +08:00
James Chen
f2303b854a
Fixed a typo, and regenerated luabinding codes.
2013-01-23 15:59:13 +08:00
James Chen
5a41e1fc86
fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp.
2013-01-22 14:40:54 +08:00
johnangel
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
johnangel
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
minggo
ffd0ca6c0e
Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility
...
[luabinding] fix CCAssert Lua compatibility
2013-01-03 23:51:47 -08:00
dualface
e74e597dba
[luabinding] fix CCAssert Lua compatibility
2012-12-30 02:27:25 +08:00
James Chen
0ee9cf027b
Merge pull request #1803 from dumganhar/iss1627-vs2012
...
fixed #1627 : VS version check in project file.
2012-12-28 22:54:04 -08:00
James Chen
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
dualface
d1e39a9c00
[luabinding] add CCDirector::setDisplayStats()
2012-12-29 11:16:07 +08:00
James Chen
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00