From 5c0a97167ce06660e193a3e339369599f064583d Mon Sep 17 00:00:00 2001 From: Jin Yoon Date: Mon, 10 Aug 2015 21:04:10 +0900 Subject: [PATCH] Merge with chun and jin --- .cproject | 16 +- .sdk_delta.info | Bin 37657 -> 49068 bytes .sign/.manifest.tmp | 66 +-- .sign/author-signature.xml | 202 +++++--- .sign/signature1.xml | 202 +++++--- chun/Makefile | 20 - chun/img/add_btn.png | Bin 1665 -> 0 bytes chun/img/next_btn.png | Bin 1665 -> 0 bytes chun/main.c | 31 -- chun/main.edc | 285 ----------- chun/main.o | Bin 10180 -> 0 bytes chun/momentic | Bin 14099 -> 0 bytes chun/momentic/Makefile | 30 ++ chun/momentic/img/Daynight layer.png | Bin 0 -> 7978 bytes chun/momentic/img/add_btn.png | Bin 0 -> 2143 bytes .../img/city0.png} | Bin 4243 -> 2983 bytes chun/momentic/img/city01.png | Bin 0 -> 2999 bytes chun/momentic/img/city1.png | Bin 0 -> 2881 bytes chun/momentic/img/city11.png | Bin 0 -> 2855 bytes chun/momentic/img/city2.png | Bin 0 -> 2894 bytes chun/momentic/img/city21.png | Bin 0 -> 2855 bytes chun/momentic/img/next_btn.png | Bin 0 -> 5639 bytes chun/momentic/img/orange small.png | Bin 0 -> 2909 bytes chun/momentic/img/orange.png | Bin 0 -> 3116 bytes chun/momentic/img/pink small.png | Bin 0 -> 2908 bytes chun/momentic/img/pink.png | Bin 0 -> 3119 bytes .../img/searching list.png} | Bin chun/momentic/img/searchlist.png | Bin 0 -> 3572 bytes chun/{ => momentic}/img/world_map.png | Bin chun/momentic/main.c | 105 ++++ chun/momentic/main.o | Bin 0 -> 10252 bytes chun/momentic/map.c | 139 ++++++ chun/momentic/map.h | 25 + chun/momentic/map.o | Bin 0 -> 14332 bytes chun/momentic/momentic | Bin 0 -> 27816 bytes chun/momentic/momentic.edc | 556 +++++++++++++++++++++ chun/{main.edj => momentic/momentic.edj} | Bin 56877 -> 61655 bytes inc/city.h | 2 +- inc/conf.h | 6 + inc/db.h | 7 + inc/group_info.h | 4 +- inc/item.h | 18 + inc/main.h | 3 + inc/main_view.h | 4 +- inc/map.h | 76 +-- inc/popup.h | 8 + inc/scroller.h | 2 + inc/util.h | 4 + res/edje/conf.h | 14 + res/edje/item.edc | 89 ++++ res/edje/main_view.edc | 80 +++ res/edje/momentic.edc | 555 ++++++++++++++++++++ shared/res/adventure.png | Bin 57662 -> 9365 bytes src/db.c | 71 ++- src/group_info.c | 2 +- src/item.c | 180 ++++++- src/main_view.c | 434 ++++++++++++++-- src/map.c | 145 +++++- src/popup.c | 43 ++ src/scroller.c | 44 ++ 60 files changed, 2748 insertions(+), 720 deletions(-) delete mode 100755 chun/Makefile delete mode 100644 chun/img/add_btn.png delete mode 100644 chun/img/next_btn.png delete mode 100755 chun/main.c delete mode 100755 chun/main.edc delete mode 100755 chun/main.o delete mode 100755 chun/momentic create mode 100755 chun/momentic/Makefile create mode 100755 chun/momentic/img/Daynight layer.png create mode 100644 chun/momentic/img/add_btn.png rename chun/{img/floting_next_button.png => momentic/img/city0.png} (63%) create mode 100755 chun/momentic/img/city01.png create mode 100755 chun/momentic/img/city1.png create mode 100755 chun/momentic/img/city11.png create mode 100755 chun/momentic/img/city2.png create mode 100755 chun/momentic/img/city21.png create mode 100755 chun/momentic/img/next_btn.png create mode 100755 chun/momentic/img/orange small.png create mode 100755 chun/momentic/img/orange.png create mode 100755 chun/momentic/img/pink small.png create mode 100755 chun/momentic/img/pink.png rename chun/{img/searchlist.png => momentic/img/searching list.png} (100%) create mode 100755 chun/momentic/img/searchlist.png rename chun/{ => momentic}/img/world_map.png (100%) create mode 100755 chun/momentic/main.c create mode 100644 chun/momentic/main.o create mode 100755 chun/momentic/map.c create mode 100755 chun/momentic/map.h create mode 100644 chun/momentic/map.o create mode 100755 chun/momentic/momentic create mode 100755 chun/momentic/momentic.edc rename chun/{main.edj => momentic/momentic.edj} (58%) create mode 100644 inc/popup.h create mode 100644 res/edje/conf.h create mode 100644 res/edje/momentic.edc create mode 100644 src/popup.c diff --git a/.cproject b/.cproject index 91a7b66..1460dfa 100755 --- a/.cproject +++ b/.cproject @@ -25,7 +25,7 @@