store png
onCreateView
no auto
before merge
Merge remote-tracking branch 'origin/soft' into softgame

Conflicts:
	Resources/Dialog/AboutDialog.lua
	Resources/Dialog/AlertDialog.lua
	Resources/Dialog/BattleDialog.lua
	Resources/Dialog/BattleResultDialog.lua
	Resources/Dialog/ClanDialog.lua
	Resources/Dialog/ErrorDialog.lua
	Resources/Dialog/FeedbackDialog.lua
	Resources/Dialog/HistoryDialog.lua
	Resources/Dialog/InfoDialog.lua
	Resources/Dialog/RankDialog.lua
	Resources/Dialog/RenameDialog.lua
	Resources/Dialog/ResearchDialog.lua
	Resources/Dialog/SNSDialog.lua
	Resources/Dialog/SettingDialog.lua
	Resources/Dialog/StoreDialog.lua
	Resources/Dialog/TrainDialog.lua
	Resources/Dialog/UpgradeDialog.lua
	Resources/Dialog/VideoDialog.lua
	Resources/Dialog/WaitAttackDialog.lua
	Resources/Dialog/ZombieDialog.lua
	Resources/General/Achievements.lua
	Resources/General/General.lua
	Resources/General/SNS.lua
	Resources/General/display.lua
	Resources/General/music.lua
	Resources/General/network.lua
	Resources/General/screen.lua
	Resources/General/timer.lua
	Resources/Logic/AdsLogic.lua
	Resources/Logic/BattleLogic.lua
	Resources/Logic/CrystalLogic.lua
	Resources/Logic/PauseLogic.lua
	Resources/Logic/ReplayLogic.lua
	Resources/Logic/ResourceLogic.lua
	Resources/Logic/SoldierLogic.lua
	Resources/Logic/UpdateLogic.lua
	Resources/Logic/ZombieLogic.lua
	Resources/Mould/Build.lua
	Resources/Mould/Build/AirDefense.lua
	Resources/Mould/Build/ArcherTower.lua
	Resources/Mould/Build/Barrack.lua
	Resources/Mould/Build/BuildMould.lua
	Resources/Mould/Build/BuildView.lua
	Resources/Mould/Build/BuilderRoom.lua
	Resources/Mould/Build/Camp.lua
	Resources/Mould/Build/Cannon.lua
	Resources/Mould/Build/Clan.lua
	Resources/Mould/Build/Dector.lua
	Resources/Mould/Build/Defense.lua
	Resources/Mould/Build/FoodFactory.lua
	Resources/Mould/Build/FoodStorage.lua
	Resources/Mould/Build/Hidden.lua
	Resources/Mould/Build/House.lua
	Resources/Mould/Build/Laboratory.lua
	Resources/Mould/Build/Mortar.lua
	Resources/Mould/Build/Nozomi.lua
	Resources/Mould/Build/Obstacle.lua
	Resources/Mould/Build/OilFactory.lua
	Resources/Mould/Build/OilStorage.lua
	Resources/Mould/Build/SpecialStorage.lua
	Resources/Mould/Build/Storage.lua
	Resources/Mould/Build/Town.lua
	Resources/Mould/Build/Trap.lua
	Resources/Mould/Build/Wall.lua
	Resources/Mould/Build/WizardTower.lua
	Resources/Mould/Build/Xbow.lua
	Resources/Mould/Build/ZombieBarrack.lua
	Resources/Mould/Build/ZombieCamp.lua
	Resources/Mould/Builder.lua
	Resources/Mould/FlyObject.lua
	Resources/Mould/NPC.lua
	Resources/Mould/Person.lua
	Resources/Mould/SceneObj.lua
	Resources/Mould/Soldier.lua
	Resources/Mould/Soldier/Archer.lua
	Resources/Mould/Soldier/Balloon.lua
	Resources/Mould/Soldier/Bomb.lua
	Resources/Mould/Soldier/Giant.lua
	Resources/Mould/Soldier/Healer.lua
	Resources/Mould/Soldier/Mech.lua
	Resources/Mould/Soldier/UFO.lua
	Resources/Mould/Soldier/Wizard.lua
	Resources/Mould/Tomb.lua
	Resources/Mould/Zombie.lua
	Resources/Scene/BattleMenuLayer.lua
	Resources/Scene/CastleScene.lua
	Resources/Scene/ChatRoom.lua
	Resources/Scene/LoadingScene.lua
	Resources/Scene/MapGridView.lua
	Resources/Scene/MenuLayer.lua
	Resources/Scene/PreBattleScene.lua
	Resources/Scene/SceneChangeDelegate.lua
	Resources/UI/BloodProcess.lua
	Resources/UI/DialogUI.lua
	Resources/UI/Effect.lua
	Resources/UI/Effect/Flame.lua
	Resources/UI/Effect/Splash.lua
	Resources/UI/Lightning.lua
	Resources/UI/PrintTTFLabel.lua
	Resources/UI/Slider.lua
	Resources/UI/TabView.lua
	Resources/UI/UI.lua
	Resources/Util/Action.lua
	Resources/Util/Body.lua
	Resources/Util/Class.lua
	Resources/Util/MapGrid.lua
	Resources/Util/MapGridUtil.lua
	Resources/Util/MySpriteSheet.lua
	Resources/Util/Random.lua
	Resources/Util/Ray.lua
	Resources/Util/ReuseNodeCache.lua
	Resources/Util/RhombGrid.lua
	Resources/Util/SimpleJson.lua
	Resources/Util/Touch.lua
	Resources/Util/Util.lua
	Resources/Util/World.lua
	Resources/Util/character.lua
	Resources/Util/dkjson.lua
	Resources/Util/heapq.lua
	Resources/Util/json.lua
	Resources/Util/queue.lua
	Resources/data/StaticData.lua
	Resources/data/TipsData.lua
	Resources/data/buildDatas.lua
	Resources/data/buildDefences.lua
	Resources/data/buildInfos.lua
	Resources/data/events.lua
	Resources/data/researchInfos.lua
	Resources/data/soldierDatas.lua
	Resources/data/soldierInfos.lua
	Resources/data/strings.lua
	Resources/data/tips.lua
	Resources/main.lua
	Resources/param.lua
MyAds remove package and add moregames view CCNative post Notification