From 3afa9d9c4a797f4b78597c7da60a96ab8a51c7ae Mon Sep 17 00:00:00 2001 From: calfjohn Date: Thu, 30 Oct 2014 11:54:49 +0800 Subject: [PATCH 1/5] delete 'if' branch, Rat.lua is override dyingMode and hurt function, 'if' it not necessary --- src/actors/Actor.lua | 3 --- src/actors/Rat.lua | 44 ++++++++++++++++++-------------------------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/src/actors/Actor.lua b/src/actors/Actor.lua index 45bddd7a..208ea833 100644 --- a/src/actors/Actor.lua +++ b/src/actors/Actor.lua @@ -164,9 +164,6 @@ function Actor:hurt(collider, dirKnockMode) --three param judge if crit local blood = self._hpCounter:showBloodLossNum(damage,self,critical) - if self._name == "Rat" then - blood:setPositionZ(G.winSize.height*0.25) - end self:addEffect(blood) return damage end diff --git a/src/actors/Rat.lua b/src/actors/Rat.lua index 68ca0bab..2e6c3ad5 100644 --- a/src/actors/Rat.lua +++ b/src/actors/Rat.lua @@ -80,31 +80,25 @@ function Rat:dyingMode(knockSource, knockAmount) self:setStateType(EnumStateType.DYING) self:playAnimation("dead") self:playDyingEffects() - if self._racetype == EnumRaceType.HERO then - uiLayer:heroDead(self) - List.removeObj(HeroManager,self) - self:runAction(cc.Sequence:create(cc.DelayTime:create(3),cc.MoveBy:create(1.0,cc.V3(0,0,-50)),cc.RemoveSelf:create())) - else - List.removeObj(MonsterManager,self) - local function recycle() - --self:setVisible(false) - --List.pushlast(getPoolByName(self._name),self) - self:removeFromParent() - if gameMaster ~= nil then - gameMaster:showVictoryUI() - end - end - local function disableHeroAI() - if List.getSize(HeroManager) ~= 0 then - for var = HeroManager.first, HeroManager.last do - HeroManager[var]:setAIEnabled(false) - HeroManager[var]:idleMode() - HeroManager[var]._goRight = false - end - end + + List.removeObj(MonsterManager,self) + local function recycle() + self:removeFromParent() + if gameMaster ~= nil then + gameMaster:showVictoryUI() + end + end + + local function disableHeroAI() + if List.getSize(HeroManager) ~= 0 then + for var = HeroManager.first, HeroManager.last do + HeroManager[var]:setAIEnabled(false) + HeroManager[var]:idleMode() + HeroManager[var]._goRight = false + end end - self:runAction(cc.Sequence:create(cc.DelayTime:create(3),cc.CallFunc:create(disableHeroAI),cc.MoveBy:create(1.0,cc.V3(0,0,-50)),cc.CallFunc:create(recycle))) end + self:runAction(cc.Sequence:create(cc.DelayTime:create(3),cc.CallFunc:create(disableHeroAI),cc.MoveBy:create(1.0,cc.V3(0,0,-50)),cc.CallFunc:create(recycle))) if knockAmount then local p = self._myPos @@ -154,9 +148,7 @@ function Rat:hurt(collider, dirKnockMode) --three param judge if crit local blood = self._hpCounter:showBloodLossNum(damage,self,critical) - if self._name == "Rat" then - blood:setPositionZ(G.winSize.height*0.25) - end + blood:setPositionZ(G.winSize.height*0.25) self:addEffect(blood) return damage From 915813088936fdef5ada3901b6e719697588bbb5 Mon Sep 17 00:00:00 2001 From: calfjohn Date: Thu, 30 Oct 2014 15:17:48 +0800 Subject: [PATCH 2/5] delete _prePosition, because delta position is already exist, it's not necessary to calculate --- src/BattleScene.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/BattleScene.lua b/src/BattleScene.lua index 2a13f352..6b723f7b 100644 --- a/src/BattleScene.lua +++ b/src/BattleScene.lua @@ -132,20 +132,15 @@ end function BattleScene:enableTouch() local function onTouchBegin(touch,event) - self._prePosition = touch:getLocation() - --cclog("onTouchBegin: %0.2f, %0.2f", self._prePosition.x, self._prePosition.y) + --cclog("onTouchBegin: %0.2f, %0.2f", touch:getLocation()) return true end local function onTouchMoved(touch,event) - local location = touch:getLocation() - if self:UIcontainsPoint(location) == nil then local delta = touch:getDelta() cameraOffset = cc.pGetClampPoint(cc.pSub(cameraOffset, delta),cameraOffsetMin,cameraOffsetMax) end - - self._prePosition = location end local function onTouchEnded(touch,event) From 514039b4c95c621686bbcd5de848e07483713ae9 Mon Sep 17 00:00:00 2001 From: calfjohn Date: Thu, 30 Oct 2014 15:21:30 +0800 Subject: [PATCH 3/5] fixed a bug, my fault --- src/BattleScene.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BattleScene.lua b/src/BattleScene.lua index 6b723f7b..028ee2e2 100644 --- a/src/BattleScene.lua +++ b/src/BattleScene.lua @@ -137,7 +137,7 @@ function BattleScene:enableTouch() end local function onTouchMoved(touch,event) - if self:UIcontainsPoint(location) == nil then + if self:UIcontainsPoint(touch:getLocation()) == nil then local delta = touch:getDelta() cameraOffset = cc.pGetClampPoint(cc.pSub(cameraOffset, delta),cameraOffsetMin,cameraOffsetMax) end From eaa9cdb945516066af9e97f9214bae2824c2fa06 Mon Sep 17 00:00:00 2001 From: calfjohn Date: Thu, 30 Oct 2014 15:38:26 +0800 Subject: [PATCH 4/5] delete test and useless code --- src/AttackCommand.lua | 9 --------- src/BattleFieldUI.lua | 3 --- src/BattleScene.lua | 16 +++------------- src/GlobalVariables.lua | 8 -------- src/actors/Actor.lua | 24 +----------------------- src/actors/Dragon.lua | 2 -- src/actors/Knight.lua | 28 +--------------------------- 7 files changed, 5 insertions(+), 85 deletions(-) diff --git a/src/AttackCommand.lua b/src/AttackCommand.lua index be775546..bc83216e 100644 --- a/src/AttackCommand.lua +++ b/src/AttackCommand.lua @@ -265,15 +265,6 @@ function MageIceSpikes.create(pos, facing, attackInfo, owner) x:runAction(cc.EaseBackOut:create(cc.MoveBy:create(0.3,cc.V3(0,0,200)))) x:runAction(cc.EaseBounceOut:create(cc.ScaleTo:create(0.4, 1))) --- local puff = cc.BillboardParticleSystem:create("FX/puffRing2.plist") --- --local puff = cc.ParticleSystemQuad:create("FX/puffRing.plist") --- local puffFrame = cc.SpriteFrameCache:getInstance():getSpriteFrame("puff.png") --- puff:setTextureWithRect(puffFrame:getTexture(), puffFrame:getRect()) --- puff:setCamera(camera) --- puff:setScale(3) --- ret:addChild(puff) --- puff:setGlobalZOrder(-ret:getPositionY()*2+FXZorder) - local magic = cc.BillboardParticleSystem:create(ParticleManager:getInstance():getPlistData("magic")) local magicf = cc.SpriteFrameCache:getInstance():getSpriteFrame("particle.png") magic:setTextureWithRect(magicf:getTexture(), magicf:getRect()) diff --git a/src/BattleFieldUI.lua b/src/BattleFieldUI.lua index 727cedab..2049baf4 100755 --- a/src/BattleFieldUI.lua +++ b/src/BattleFieldUI.lua @@ -241,9 +241,6 @@ function BattlefieldUI:touchButtonInit() self._coinAmount:setScaleX(0.8) self._coinAmount:setScaleY(0.7) self:addChild(self._coinAmount,2) --- MessageDispatchCenter:registerMessage(MessageDispatchCenter.MessageType.SPECIAL_KNIGHT, particleRelease) --- MessageDispatchCenter:registerMessage(MessageDispatchCenter.MessageType.SPECIAL_ARCHER, particleRelease) --- MessageDispatchCenter:registerMessage(MessageDispatchCenter.MessageType.SPECIAL_MAGE, particleRelease) end local scheduleID = nil diff --git a/src/BattleScene.lua b/src/BattleScene.lua index 028ee2e2..278c4dc9 100644 --- a/src/BattleScene.lua +++ b/src/BattleScene.lua @@ -20,19 +20,16 @@ local function moveCamera(dt) local cameraPosition = getPosTable(camera) local focusPoint = getFocusPointOfHeros() if specialCamera.valid == true then - --local position = cc.pRotateByAngle(cameraPosition, cc.p(specialCamera.position.x, -size.height/2), -360/60/2*dt) local position = cc.pLerp(cameraPosition, cc.p(specialCamera.position.x, (cameraOffset.y + focusPoint.y-size.height*3/4)*0.5), 5*dt) camera:setPosition(position) camera:lookAt(cc.V3(position.x, specialCamera.position.y, 50.0), cc.V3(0.0, 1.0, 0.0)) elseif List.getSize(HeroManager) > 0 then - --local position = cc.V3(focusPoint.x, focusPoint.y, size.height/2-100) local temp = cc.pLerp(cameraPosition, cc.p(focusPoint.x+cameraOffset.x, cameraOffset.y + focusPoint.y-size.height*3/4), 2*dt) local position = cc.V3(temp.x, temp.y, size.height/2-100) - camera:setPosition3D(position) - camera:lookAt(cc.V3(position.x, focusPoint.y, 50.0), cc.V3(0.0, 0.0, 1.0)) - --cclog("\ncalf %f %f %f \ncalf %f %f 50.000000", position.x, position.y, position.z, focusPoint.x, focusPoint.y) --- end + camera:setPosition3D(position) + camera:lookAt(cc.V3(position.x, focusPoint.y, 50.0), cc.V3(0.0, 0.0, 1.0)) + --cclog("\ncalf %f %f %f \ncalf %f %f 50.000000", position.x, position.y, position.z, focusPoint.x, focusPoint.y) end end @@ -51,7 +48,6 @@ local function createBackground() currentLayer:addChild(spriteBg) spriteBg:setScale(2.65) - --spriteBg:setGlobalZOrder(-9) spriteBg:setPosition3D(cc.V3(-2300,-1000,0)) spriteBg:setRotation3D(cc.V3(90,0,0)) @@ -65,15 +61,9 @@ end local function setCamera() camera = cc.Camera:createPerspective(60.0, size.width/size.height, 10.0, 4000.0) --- local focusPoint = getFocusPointOfHeros() --- local position = cc.V3(focusPoint.x, focusPoint.y-size.height, size.height/2-100) --- camera:setPosition3D(position) --- camera:lookAt(cc.V3(focusPoint.x, focusPoint.y, 0.0), cc.V3(0.0, 0.0, 1.0)) camera:setGlobalZOrder(10) currentLayer:addChild(camera) --- cameraOffset = cc.V3(0, 0, 0) - for val = HeroManager.first, HeroManager.last do local sprite = HeroManager[val] if sprite._puff then diff --git a/src/GlobalVariables.lua b/src/GlobalVariables.lua index c6cfb49f..17b4822e 100755 --- a/src/GlobalVariables.lua +++ b/src/GlobalVariables.lua @@ -64,16 +64,8 @@ AUDIO_ID = } EnumRaceType = { - "DEBUG", - "BASE", "HERO", --only this - "WARRIOR", - "KNIGHT", - "ARCHER", - "MAGE", "MONSTER", --and this - "BOSS", - "DRAGON", } EnumRaceType = CreateEnumTable(EnumRaceType) diff --git a/src/actors/Actor.lua b/src/actors/Actor.lua index 208ea833..851f9b7e 100644 --- a/src/actors/Actor.lua +++ b/src/actors/Actor.lua @@ -440,29 +440,7 @@ function Actor:movementUpdate(dt) --left self._curFacing = self._curFacing + turnby end --- if self._name == "Knight" then --- --print(RADIANS_TO_DEGREES(angleDt), "angleDt", RADIANS_TO_DEGREES(turnby)) --- end - --- self._curFacing = self._curFacing + turnby --- if self._name == "Knight" then --- print(RADIANS_TO_DEGREES(angleDt), "angleDt")end --- if turnby > (math.pi*2) then --- turnby = turnby - (math.pi*2) --- end --- if self._curFacing > self._targetFacing then ----- if turnby > angleDt then ----- self._curFacing = self._targetFacing ----- else --- self._curFacing = self._curFacing - turnby --- --end --- elseif self._curFacing < self._targetFacing then ----- if turnby < angleDt then ----- self._curFacing = self._targetFacing ----- else --- self._curFacing = self._curFacing + turnby --- --end --- end + self:setRotation(-RADIANS_TO_DEGREES(self._curFacing)) end --position update diff --git a/src/actors/Dragon.lua b/src/actors/Dragon.lua index f77a114f..75c1c63e 100644 --- a/src/actors/Dragon.lua +++ b/src/actors/Dragon.lua @@ -77,13 +77,11 @@ end function Dragon:normalAttack() self:normalAttackSoundEffects() DragonAttack.create(getPosTable(self), self._curFacing, self._normalAttack) --- BossNormal.create(getPosTable(self), self._curFacing, self._normalAttack) end function Dragon:init3D() self:initShadow() self._sprite3d = cc.EffectSprite3D:create(file) - -- self._sprite3d:setTexture("model/dragon/xiaohuolong_body.jpg") self._sprite3d:setScale(10) self._sprite3d:addEffect(cc.V3(0,0,0),CelLine, -1) self:addChild(self._sprite3d) diff --git a/src/actors/Knight.lua b/src/actors/Knight.lua index d0eb4687..02b7960e 100644 --- a/src/actors/Knight.lua +++ b/src/actors/Knight.lua @@ -27,34 +27,8 @@ function Knight:ctor() end function Knight.create() - local ret = Knight.new() - --ret:setRaceType(EnumRaceType.WARRIOR) - - - --=====Testing block - ret:idleMode() - function test() --- ret:walkMode() --- ret._targetFacing = DEGREES_TO_RADIANS(120) - ret._AIEnabled = true - end - function test2() - ret:idleMode() - ret._targetFacing = 0 - end - function test3() - ret:attackMode() - end - function test4() - ret:knockMode({x=-1000,y=00}, 150) - end - - --delayExecute(ret,test,0.5) + local ret = Knight.new() --- delayExecute(ret,test2,2.5) --- delayExecute(ret,test,3.5) --- delayExecute(ret,test3,4.5) - --=====testing block ret._AIEnabled = true --this update function do not do AI function update(dt) From 56d278d2cee1d821cd6b9e92e538421860a363d5 Mon Sep 17 00:00:00 2001 From: calfjohn Date: Fri, 31 Oct 2014 18:19:53 +0800 Subject: [PATCH 5/5] delete useless lua file --- src/BattleScene.lua | 2 +- src/MonsterActors.lua | 131 ------------------------------------------ 2 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 src/MonsterActors.lua diff --git a/src/BattleScene.lua b/src/BattleScene.lua index 278c4dc9..bfafe92e 100644 --- a/src/BattleScene.lua +++ b/src/BattleScene.lua @@ -75,10 +75,10 @@ local function setCamera() end local function gameController(dt) + gameMaster:update(dt) collisionDetect(dt) solveAttacks(dt) moveCamera(dt) - gameMaster:update(dt) end local function initUILayer() diff --git a/src/MonsterActors.lua b/src/MonsterActors.lua deleted file mode 100644 index 7a4885cc..00000000 --- a/src/MonsterActors.lua +++ /dev/null @@ -1,131 +0,0 @@ -require "GlobalVariables" - -MonsterSlime = class("MonsterSlime",function () - return require "Actor".create() -end) - -function MonsterSlime:ctor() - -end - -function MonsterSlime.create(filename) - - local slime = MonsterSlime.new() - slime:addSprite3D(filename) - - -- base - slime:setRaceType(EnumRaceType.MONSTER) - slime:initActions() - - return slime -end - -function MonsterSlime:addSprite3D(filename) - self._sprite3d = cc.EffectSprite3D:create(filename) - self:addChild(self._sprite3d) - self._sprite3d:setRotation3D({x = 90, y = 0, z = 0}) - self._sprite3d:setRotation(-90) -end - - -function MonsterSlime:initActions() - -end - -MonsterDragon = class("MonsterDragon",function () - return require "Actor".create() -end) - -function MonsterDragon:ctor() - -end - -function MonsterDragon.create() - - local dragon = MonsterDragon.new() - dragon:addSprite3D() - - -- base - dragon:setRaceType(EnumRaceType.MONSTER) - dragon:initActions() - - return dragon -end - -function MonsterDragon:addSprite3D() - self._sprite3d = cc.EffectSprite3D:create(MonsterDragonValues.fileName) - self:addChild(self._sprite3d) - self._sprite3d:setRotation3D({x = 90, y = 0, z = 0}) - self._sprite3d:setRotation(-90) -end - - -function MonsterDragon:initActions() - -end - -MonsterRat = class("MonsterRat",function () - return require "Actor".create() -end) - -function MonsterRat:ctor() - -end - -function MonsterRat.create() - - local rat = MonsterRat.new() - rat:addSprite3D() - - -- base - rat:setRaceType(EnumRaceType.MONSTER) - rat:initActions() - - return rat -end - -function MonsterRat:addSprite3D() - self._sprite3d = cc.EffectSprite3D:create(MonsterRatValues.fileName) - self._sprite3d:setTexture("model/rat/tou1.jpg") - self:addChild(self._sprite3d) - self._sprite3d:setRotation3D({x = 90, y = 0, z = 0}) - self._sprite3d:setRotation(-90) -end - - -function MonsterRat:initActions() - -end - -MonsterPiglet = class("MonsterPiglet",function () - return require "Actor".create() -end) - -function MonsterPiglet:ctor() - -end - -function MonsterPiglet.create() - - local piglet = MonsterPiglet.new() - piglet:addSprite3D() - - -- base - piglet:setRaceType(EnumRaceType.MONSTER) - piglet:initActions() - - return piglet -end - -function MonsterPiglet:addSprite3D() - self._sprite3d = cc.EffectSprite3D:create(MonsterPigletValues.fileName) - self:addChild(self._sprite3d) - self._sprite3d:setRotation3D({x = 90, y = 0, z = 0}) - self._sprite3d:setRotation(-90) -end - - -function MonsterPiglet:initActions() - -end -