修复了技能日志错误的问题

足迹中取消显示触发器相关内容

Author: FENG-MASTER

app/src/main/java/com/lifegamer/fengmaster/lifegamer/adapter/list/log/AllLogAdapter.java

@@ -1,6 +1,9 @@
 package com.lifegamer.fengmaster.lifegamer.adapter.list.log;
 
+import com.annimon.stream.Stream;
 import com.lifegamer.fengmaster.lifegamer.Game;
+import com.lifegamer.fengmaster.lifegamer.model.Log;
+
 
 /**
  * 所有日志足迹列表
@@ -9,7 +12,9 @@
 public class AllLogAdapter extends BaseLogAdapter{
     @Override
     public void updateShowList() {
-        showList= Game.getInstance().getLogManager().getAllLog();
+        showList= Stream.of(Game.getInstance().getLogManager().getAllLog()).
+                filterNot(value -> value.getType().equals(Log.TYPE.TRIGGER)).
+                sorted((o1, o2) -> Long.compare(o2.getId(),o1.getId())).toList();
     }
 
 

app/src/main/java/com/lifegamer/fengmaster/lifegamer/manager/TaskManager.java

@@ -230,28 +230,27 @@ public boolean failTask(long taskID) {
 
     private boolean failTask(Task task) {
         if (task != null) {
+            return  _failTask(task);
+        } else {
+            //null失败
+            return false;
+        }
+    }
 
-            //失败次数+1
-            task.setFailureTimes(task.getFailureTimes() + 1);
-
+    @LogPoint(type = Log.TYPE.TASK,action = Log.ACTION.FAIL,property = Log.PROPERTY.TASK)
+    private boolean _failTask(Task task){
 
-//            //金币点数惩罚
-//            handleLifePoint(task,false);
-//            handleSkillReward(task,false);
-//            handleItemReward(task,false);
-//            handleAchievement(task,false);
+        //失败次数+1
+        task.setFailureTimes(task.getFailureTimes() + 1);
 
-            //重新调度任务时间
-            scheduleTaskTime(task);
+        //重新调度任务时间
+        scheduleTaskTime(task);
 
-            EventBus.getDefault().post(new FailTaskEvent(task));
+        EventBus.getDefault().post(new FailTaskEvent(task));
+        Game.update(task);
 
-            return true;
+        return true;
 
-        } else {
-            //null失败
-            return false;
-        }
     }
 
     @Override

app/src/main/java/com/lifegamer/fengmaster/lifegamer/model/Skill.java

@@ -92,7 +92,7 @@ public void addXP(int XP) {
         if (this.XP >= getUpGradeXP()) {
             //升级
             this.XP -= getUpGradeXP();
-            levelUp();
+            levelUp(1);
         }
         notifyPropertyChanged(BR.xp);
         updateUpdateTime();
@@ -104,7 +104,7 @@ public void reduceXP(int XP) {
         this.XP -= XP;
         if (this.XP < 0) {
             //降级
-            levelDown();
+            levelDown(1);
             this.XP += getUpGradeXP();
         }
         notifyPropertyChanged(BR.xp);
@@ -122,8 +122,8 @@ public int getUpGradeXP() {
      * 升级
      */
     @LogPoint(type = Log.TYPE.SKILL,action = Log.ACTION.ADD,property = Log.PROPERTY.LEVEL)
-    public void levelUp() {
-        this.level++;
+    public void levelUp(int i) {
+        this.level+=i;
         setUpGradeXP(levelXP.getXP(getLevel()));
         notifyPropertyChanged(BR.level);
     }
@@ -132,8 +132,8 @@ public void levelUp() {
      * 降级
      */
     @LogPoint(type = Log.TYPE.SKILL,action = Log.ACTION.SUB,property = Log.PROPERTY.LEVEL)
-    public void levelDown() {
-        this.level--;
+    public void levelDown(int i) {
+        this.level-=i;
         setUpGradeXP(levelXP.getXP(getLevel()));
         notifyPropertyChanged(BR.level);
     }

app/src/main/java/com/lifegamer/fengmaster/lifegamer/strategy/xp/NormalLevelXP.java

@@ -9,6 +9,10 @@
 public class NormalLevelXP implements ILevelXP {
     @Override
     public int getXP(int level) {
-        return level*1000;
+        if (level<=0){
+            return level*-1*1000;
+        }else {
+            return level*1000;
+        }
     }
 }

app/src/main/java/com/lifegamer/fengmaster/lifegamer/trigger/condition/TaskExpireCondition.java

@@ -58,13 +58,13 @@ public void run(MinuteEvent minuteEvent) {
 
             if (lastExpireDate != null) {
                 //没有历史触发时间,
-                if (lastExpireDate.after(task.getExpirationTime())) {
+                if (lastExpireDate.equals(task.getExpirationTime())) {
                     return;
                 }
             }
 
             while (minuteEvent.getDate().after(task.getExpirationTime())) {
-                triggerInfo.setSaveInfo(String.valueOf(task.getExpirationTime().getTime()+1000));
+                triggerInfo.setSaveInfo(String.valueOf(task.getExpirationTime().getTime()));
                 Game.getInstance().getCommandManager().executeCommand(new FailTaskCommand(task));
                 Game.getInstance().getTriggerManager().updateTriggerInfo(triggerInfo);
             }