equippedShipName、equippedShipLvは補強増設も考慮するようにした

diff --git a/KCD/HMKCSlotItemObject+Extensions.m b/KCD/HMKCSlotItemObject+Extensions.m
index 78f1b73..23596fd 100644 (file)
--- a/KCD/HMKCSlotItemObject+Extensions.m
+++ b/KCD/HMKCSlotItemObject+Extensions.m
@@ -28,6 +28,12 @@
        [self willAccessValueForKey:@"equippedShip"];
        NSString *equippedShipName = self.equippedShip.name;
        [self didAccessValueForKey:@"equippedShip"];
+       
+       if(!equippedShipName) {
+               [self willAccessValueForKey:@"extraEquippedShip"];
+               equippedShipName = self.extraEquippedShip.name;
+               [self didAccessValueForKey:@"extraEquippedShip"];
+       }
        return equippedShipName;
 }
 - (NSNumber *)equippedShipLv
@@ -35,6 +41,12 @@
        [self willAccessValueForKey:@"equippedShip"];
        NSNumber *equippedShipLv = self.equippedShip.lv;
        [self didAccessValueForKey:@"equippedShip"];
+       
+       if(!equippedShipLv) {
+               [self willAccessValueForKey:@"extraEquippedShip"];
+               equippedShipLv = self.extraEquippedShip.lv;
+               [self didAccessValueForKey:@"extraEquippedShip"];
+       }
        return equippedShipLv;
 }
 - (NSNumber *)masterSlotItemRare