code changes for 2.6.0

moonheart · Jan 12, 2024 · f873e07 · f873e07
1 parent bdc17c8
commit f873e07
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/MementoMori.Ortega/Common/Enums/ClientErrorCode.cs b/MementoMori.Ortega/Common/Enums/ClientErrorCode.cs
@@ -238,6 +238,7 @@ public enum ClientErrorCode
 		LevelLinkCannotOpenSlot,
 		LevelLinkNotSelectCharacter,
 		LevelLinkNotExistSelectableCharacter,
+        LevelLinkReachedMaxLevel,
 		TowerBattleDayChallengeLimit = 1500001,
 		TowerBattleCannotSelectCharacter,
 		BountyQuestAutoSelect = 1600001,

diff --git a/MementoMori.Ortega/Share/Enums/Battle/Skill/PassiveTrigger.cs b/MementoMori.Ortega/Share/Enums/Battle/Skill/PassiveTrigger.cs
@@ -38,6 +38,8 @@ public enum PassiveTrigger
         [Description("被連携ダメージ時")] ReceiveResonanceDamage,
         [Description("被ダメージ量判定(自分の情報だけ参照)")] CheckReceiveDamageSelf = 41,
         [Description("被ダメージ量判定")] CheckReceiveDamage,
+        [Description("被持続ダメージ量判定(P41)時パッシブトリガー")] NextCheckReceiveDamageSelf,
+        [Description("被ダメージ量判定")] NextCheckReceiveDamage,
         [Description("被致命的ダメージ時回復")] RecoveryFromInstantDeathDamage = 52,
         [Description("特殊ダメージ死亡(毒、共鳴など)")] SpecialDamageDead = 62
     }

diff --git a/MementoMori.Ortega/Share/Enums/ChatType.cs b/MementoMori.Ortega/Share/Enums/ChatType.cs
@@ -6,6 +6,7 @@ public enum ChatType
 		World,
 		Guild,
 		Private,
-		Friend
+		Friend,
+        Block
 	}
 }
diff --git a/MementoMori.Ortega/Share/Enums/LimitedEventType.cs b/MementoMori.Ortega/Share/Enums/LimitedEventType.cs
@@ -10,10 +10,6 @@ public enum LimitedEventType
         [Description("属性の塔全開放")]
         ElementTowerAllRelease,
         [Description("シリアルコード入力")]
-        SerialCode,
-        [Description("レジェンドリーグアイコン報酬")]
-        LegendLeagueIconReward,
-        [Description("レジェンドリーグアイコン報酬ダイアログ表示切替")]
-        DialogGlobalPvpSpecialPlayerIconListViewControllerOld = 1000
+        SerialCode
     }
 }
diff --git a/MementoMori.Ortega/Share/Enums/MaintenanceFunctionType.cs b/MementoMori.Ortega/Share/Enums/MaintenanceFunctionType.cs
@@ -68,6 +68,8 @@ public enum MaintenanceFunctionType
 		[Description("アイテム消費-キャラ抽選宝箱")]
 		CharacterGachaBoxItem,
 		[Description("新規ユーザー")]
-		NewUser
+		NewUser,
+        [Description("チャット画面-ブロック")]
+        BlockInChatRoom = 33
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ public enum ChatType @@
     		World,
     		Guild,
     		Private,
-    		Friend
+    		Friend,
+            Block
     	}
     }