バグ改善

diff --git a/Awars III.xcodeproj/project.pbxproj b/Awars III.xcodeproj/project.pbxproj
index 5ca3309..1b57ae2 100755 (executable)
--- a/Awars III.xcodeproj/project.pbxproj
+++ b/Awars III.xcodeproj/project.pbxproj
@@ -1664,6 +1664,7 @@
                C60E05C8166B143D003D5239 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "Awars III/Awars III-Prefix.pch";
@@ -1677,6 +1678,7 @@
                C60E05C9166B143D003D5239 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "Awars III/Awars III-Prefix.pch";

diff --git a/Awars III/Images.xcassets/AppIcon-3.appiconset/Contents.json b/Awars III/Images.xcassets/AppIcon-3.appiconset/Contents.json
new file mode 100644 (file)
index 0000000..50ab7bd
--- /dev/null
+++ b/Awars III/Images.xcassets/AppIcon-3.appiconset/Contents.json
@@ -0,0 +1,58 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/128-1.png b/Awars III/Images.xcassets/AppIcon.appiconset/128-1.png
new file mode 100644 (file)
index 0000000..9959aa9
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/128-1.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/128.png b/Awars III/Images.xcassets/AppIcon.appiconset/128.png
new file mode 100644 (file)
index 0000000..9959aa9
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/128.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/16.png b/Awars III/Images.xcassets/AppIcon.appiconset/16.png
new file mode 100644 (file)
index 0000000..4d8af9c
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/16.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/256-1.png b/Awars III/Images.xcassets/AppIcon.appiconset/256-1.png
new file mode 100644 (file)
index 0000000..b6fcb0d
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/256-1.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/256.png b/Awars III/Images.xcassets/AppIcon.appiconset/256.png
new file mode 100644 (file)
index 0000000..b6fcb0d
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/256.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/32-1.png b/Awars III/Images.xcassets/AppIcon.appiconset/32-1.png
new file mode 100644 (file)
index 0000000..8cf44c1
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/32-1.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/32-2.png b/Awars III/Images.xcassets/AppIcon.appiconset/32-2.png
new file mode 100644 (file)
index 0000000..8cf44c1
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/32-2.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/32.png b/Awars III/Images.xcassets/AppIcon.appiconset/32.png
new file mode 100644 (file)
index 0000000..8cf44c1
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/32.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/Contents.json b/Awars III/Images.xcassets/AppIcon.appiconset/Contents.json
index 50ab7bd..9e90eb7 100644 (file)
--- a/Awars III/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Awars III/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,54 +1,64 @@
 {
   "images" : [
     {
+      "size" : "16x16",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
+      "filename" : "16.png",
+      "scale" : "1x"
     },
     {
+      "size" : "16x16",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
+      "filename" : "32.png",
+      "scale" : "2x"
     },
     {
+      "size" : "32x32",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
+      "filename" : "32-1.png",
+      "scale" : "1x"
     },
     {
+      "size" : "32x32",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
+      "filename" : "32-2.png",
+      "scale" : "2x"
     },
     {
+      "size" : "128x128",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
+      "filename" : "128.png",
+      "scale" : "1x"
     },
     {
+      "size" : "128x128",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
+      "filename" : "128-1.png",
+      "scale" : "2x"
     },
     {
+      "size" : "256x256",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
+      "filename" : "256.png",
+      "scale" : "1x"
     },
     {
+      "size" : "256x256",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
+      "filename" : "256-1.png",
+      "scale" : "2x"
     },
     {
+      "size" : "512x512",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
+      "filename" : "awars iv512.png",
+      "scale" : "1x"
     },
     {
+      "size" : "512x512",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
+      "filename" : "awars iv512-1.png",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/awars iv512-1.png b/Awars III/Images.xcassets/AppIcon.appiconset/awars iv512-1.png
new file mode 100644 (file)
index 0000000..7583f14
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/awars iv512-1.png differ

diff --git a/Awars III/Images.xcassets/AppIcon.appiconset/awars iv512.png b/Awars III/Images.xcassets/AppIcon.appiconset/awars iv512.png
new file mode 100644 (file)
index 0000000..7583f14
Binary files /dev/null and b/Awars III/Images.xcassets/AppIcon.appiconset/awars iv512.png differ

diff --git a/Awars III/Images.xcassets/Contents.json b/Awars III/Images.xcassets/Contents.json
new file mode 100644 (file)
index 0000000..da4a164
--- /dev/null
+++ b/Awars III/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m
index bdbb394..f8ebdf9 100755 (executable)
--- a/Awars III/MapEditor.m
+++ b/Awars III/MapEditor.m
@@ -1375,7 +1375,24 @@
     }
     msdtop = MS.D;
     
-    if([eventListTV clickedRow] >= 0){
+    if([eventListMA count] == 1){
+        
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        [dict setValue:[NSString stringWithFormat:@"●"] forKey:@"value"];
+        [self willChangeValueForKey:@"eventListMA"];
+        [eventListMA addObject:dict];
+        [self didChangeValueForKey:@"eventListMA"];
+        [eventListAC setSelectionIndex:[eventListMA count]-2];
+        
+        MS.D = calloc(1, sizeof(MAPSCRIPTD));
+        MS.D->type = -1;
+        
+        msdtop = MS.D;
+        
+        if(!MS.SCRPTname) MS.SCRPTname = [NSMutableArray new];
+        [MS.SCRPTname addObject:@"新規イベント"];
+        
+    }else if([eventListTV clickedRow] >= 0){
 
         if([eventListTV clickedRow] == [eventListMA count]-1){