Skip to content

Commit 8540ee3

Browse files
committed
Version 1.02
1 parent c08eb6e commit 8540ee3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+19511
-48372
lines changed

Assets/Editor/ApiManagerEditor.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,9 @@ public override void OnInspectorGUI()
5050
SilkMap.instance.map.removeFilter("technique", "Damask");
5151
SilkMap.instance.map.applyFilters();
5252
}
53+
if (GUILayout.Button("Take Screenshot"))
54+
{
55+
ScreenCapture.CaptureScreenshot(Application.streamingAssetsPath + "/"+ Time.realtimeSinceStartup + ".png", 4);
56+
}
5357
}
5458
}

Assets/Prefabs/ClusterMarker.prefab

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ RectTransform:
149149
m_PrefabAsset: {fileID: 0}
150150
m_GameObject: {fileID: 5052332837926555069}
151151
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
152-
m_LocalPosition: {x: 0, y: 0, z: 0}
152+
m_LocalPosition: {x: 0, y: 0, z: -0.001}
153153
m_LocalScale: {x: 1, y: 1, z: 1}
154154
m_Children: []
155155
m_Father: {fileID: 4972762873440792119}
@@ -180,7 +180,7 @@ MonoBehaviour:
180180
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
181181
m_Name:
182182
m_EditorClassIdentifier:
183-
m_Material: {fileID: 0}
183+
m_Material: {fileID: 2100000, guid: af75317f36cb807429095357413febf3, type: 2}
184184
m_Color: {r: 0, g: 0, b: 0, a: 1}
185185
m_RaycastTarget: 0
186186
m_OnCullStateChanged:
@@ -238,7 +238,7 @@ RectTransform:
238238
m_AnchorMin: {x: 0.5, y: 0.5}
239239
m_AnchorMax: {x: 0.5, y: 0.5}
240240
m_AnchoredPosition: {x: 0, y: 0}
241-
m_SizeDelta: {x: 64, y: 64}
241+
m_SizeDelta: {x: 48, y: 48}
242242
m_Pivot: {x: 0.5, y: 0}
243243
--- !u!222 &4975397546655707977
244244
CanvasRenderer:
@@ -272,14 +272,14 @@ MonoBehaviour:
272272
m_PrefabInstance: {fileID: 0}
273273
m_PrefabAsset: {fileID: 0}
274274
m_GameObject: {fileID: 5052453840872320941}
275-
m_Enabled: 1
275+
m_Enabled: 0
276276
m_EditorHideFlags: 0
277277
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
278278
m_Name:
279279
m_EditorClassIdentifier:
280-
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.2509804}
280+
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
281281
m_EffectDistance: {x: 1, y: -1}
282-
m_UseGraphicAlpha: 1
282+
m_UseGraphicAlpha: 0
283283
--- !u!114 &7287532190726624275
284284
MonoBehaviour:
285285
m_ObjectHideFlags: 0
@@ -292,13 +292,13 @@ MonoBehaviour:
292292
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
293293
m_Name:
294294
m_EditorClassIdentifier:
295-
m_Material: {fileID: 0}
296-
m_Color: {r: 1, g: 1, b: 1, a: 1}
295+
m_Material: {fileID: 2100000, guid: 1d35cdbb455d8a642b6dfbb27687428d, type: 2}
296+
m_Color: {r: 0.95294124, g: 0.5176471, b: 0.40784317, a: 1}
297297
m_RaycastTarget: 1
298298
m_OnCullStateChanged:
299299
m_PersistentCalls:
300300
m_Calls: []
301-
m_Sprite: {fileID: 21300000, guid: 594f12ab9863c06489d1f10269ee4e6a, type: 3}
301+
m_Sprite: {fileID: 21300000, guid: 4cc76c1a8459ae241aa23d75becf9010, type: 3}
302302
m_Type: 0
303303
m_PreserveAspect: 0
304304
m_FillCenter: 1

Assets/Prefabs/UI/ClusterItemPopup.prefab

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ RectTransform:
176176
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
177177
m_AnchorMin: {x: 0, y: 0.5}
178178
m_AnchorMax: {x: 1, y: 0.5}
179-
m_AnchoredPosition: {x: -25, y: 0}
180-
m_SizeDelta: {x: -50, y: 100}
179+
m_AnchoredPosition: {x: -27.5, y: 0}
180+
m_SizeDelta: {x: -59, y: 45}
181181
m_Pivot: {x: 0.5, y: 0.5}
182182
--- !u!222 &698123206605662466
183183
CanvasRenderer:
@@ -206,12 +206,12 @@ MonoBehaviour:
206206
m_PersistentCalls:
207207
m_Calls: []
208208
m_FontData:
209-
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
209+
m_Font: {fileID: 12800000, guid: 42a43ae3f9fdfd045b9d38561c203cc2, type: 3}
210210
m_FontSize: 24
211-
m_FontStyle: 1
212-
m_BestFit: 0
213-
m_MinSize: 2
214-
m_MaxSize: 40
211+
m_FontStyle: 0
212+
m_BestFit: 1
213+
m_MinSize: 8
214+
m_MaxSize: 24
215215
m_Alignment: 4
216216
m_AlignByGeometry: 0
217217
m_RichText: 1

Assets/Prefabs/UI/MapItemTitlePopup.prefab

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ RectTransform:
320320
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
321321
m_AnchorMin: {x: 0, y: 0.5}
322322
m_AnchorMax: {x: 1, y: 0.5}
323-
m_AnchoredPosition: {x: -22.46, y: 0}
324-
m_SizeDelta: {x: -55.08, y: 40}
323+
m_AnchoredPosition: {x: -22.5, y: 0}
324+
m_SizeDelta: {x: -49, y: 45}
325325
m_Pivot: {x: 0.5, y: 0.5}
326326
--- !u!222 &6719910170853989723
327327
CanvasRenderer:
@@ -354,7 +354,7 @@ MonoBehaviour:
354354
m_FontSize: 24
355355
m_FontStyle: 0
356356
m_BestFit: 1
357-
m_MinSize: 2
357+
m_MinSize: 8
358358
m_MaxSize: 24
359359
m_Alignment: 4
360360
m_AlignByGeometry: 0

Assets/PygmyMonkey/ColorPalette/Resources/ColorPaletteData.asset

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MonoBehaviour:
1515
m_currentPaletteIndex: 0
1616
colorPaletteList:
1717
- name: ADASilk
18-
showDetails: 0
18+
showDetails: 1
1919
colorInfoList:
2020
- name: Random
2121
color: {r: 0.9686275, g: 0.9686275, b: 0.93725497, a: 1}
@@ -27,6 +27,10 @@ MonoBehaviour:
2727
color: {r: 0, g: 0, b: 0, a: 1}
2828
- name: Random
2929
color: {r: 0.08627451, g: 0.2509804, b: 0.42352945, a: 1}
30+
- name: Random
31+
color: {r: 0.28568888, g: 0.42260352, b: 0.5660378, a: 1}
32+
- name: Random
33+
color: {r: 0.5294118, g: 0.5372549, b: 0.75294125, a: 1}
3034
colorList: []
3135
- name: SilknowMaps
3236
showDetails: 1

Assets/Resources/langFile_Maps.csv

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,39 @@
11
Lang Code EN ES IT FR
22
^language LANGUAGE IDIOMA LINGUAGGIO LANGUE
33
^centuries Centuries Siglos secoli siècles
4-
^time_visualization Time visualization Visualización de tiempo
5-
^data_displayed Data displayed: Datos mostrados:
6-
^time_fluctuation Time fluctuation: Fluctuación de tiempo:
7-
^sequential Timeline Secuencial
8-
^split Time Layers Capas de tiempo
9-
^display_items Display items with: Mostrar items con:
10-
^technique Technique Técnica
11-
^material Material Material
12-
^gallery Gallery Galería
13-
^show_relationships Show Relationships Mostrar relaciones
14-
^images Images: Imágenes:
15-
^properties Properties: Propiedades:
16-
^clear_filters Clear Filters Limpiar filtros
17-
^description description descripción
18-
^place place lugar
19-
^time Time Tiempo
20-
^loading_data Loading Data Cargando datos
21-
^missing_time_data Missing Time Data Información de tiempo no disponible
22-
^exit_timeVisualization Exit Time Visualization Salir de Visualización de tiempo
23-
^stacked_centuries_label Centuries {0} to {1} Siglos {0} a {1}
24-
^property Property Propiedad
25-
^legend_title Relations of Properties Relaciones de propiedades
4+
^time_visualization Time visualization Visualización de tiempo Visualizzazione del tempo Visualisation du temps
5+
^data_displayed Data displayed: Datos mostrados: Dati visualizzati: Données affichées :
6+
^time_fluctuation Time fluctuation: Fluctuación de tiempo: Fluttuazione temporale: Fluctuation du temps :
7+
^sequential Timeline Secuencial Timeline Chronologie
8+
^split Time Layers Capas de tiempo Livelli temporali Les couches temporelles
9+
^display_items Display items with: Mostrar items con: Visualizzare gli articoli con: Afficher les articles avec :
10+
^technique Technique Técnica Tecnica Technique
11+
^material Material Material Materiale Matériel
12+
^gallery Gallery Galería Galleria Galerie
13+
^show_relationships Show Relationships Mostrar relaciones Mostra le relazioni Montrer les relations
14+
^images Images: Imágenes: Immagini: Images :
15+
^properties Properties: Propiedades: Proprietà: Propriétés :
16+
^clear_filters Clear Filters Limpiar filtros Filtri trasparenti Effacer les filtres
17+
^description description descripción descrizione description
18+
^place place lugar posto lieu
19+
^time Time Tiempo Tempo Heure
20+
^loading_data Loading Data Cargando datos Caricamento dei dati Chargement des données
21+
^missing_time_data Missing Time Data Información de tiempo no disponible Dati di tempo mancanti Données sur les heures manquantes
22+
^exit_timeVisualization Exit Time Visualization Salir de Visualización de tiempo Visualizzazione del tempo di uscita Visualisation du temps de sortie
23+
^stacked_centuries_label Centuries {0} to {1} Siglos {0} a {1} Secoli da {0} a {1} Siècles {0} à {1}
24+
^property Property Propiedad Proprietà Propriété
25+
^legend_title Relations of Properties Relaciones de propiedades Relazioni di proprietà Relations de propriétés
26+
^category Category Categoría Categoria Catégorie
27+
^legend Legend Leyenda Leggenda Légende
28+
^blue_markers_legend Blue markers represent objects with a unique production location. Los marcadores azules representan objetos con únicamente una localización de producción. I marcatori blu rappresentano oggetti con un unico luogo di produzione. Les marqueurs bleus représentent les objets ayant un lieu de production unique.
29+
^purple_markers_legend Purple markers represent objects that have multiple production locations (this may be due to uncertainties in the origin of the objects). Los marcadores púrpuras representan objetos con multiples localizaciones de producción (esto puede ocurrir cuando no hay certeza del origen de los objetos). I marcatori viola rappresentano oggetti che hanno più sedi di produzione (ciò può essere dovuto a incertezze sull'origine degli oggetti). Les marqueurs violets représentent les objets qui ont plusieurs lieux de production (cela peut être dû à des incertitudes sur l'origine des objets).
30+
^no_category_legend Object has no category El objeto no tiene categorías L'oggetto non ha una categoria L'objet n'a pas de catégorie
31+
^multiple_category_legend Object has multiple categories El objeto tiene múltiples categorías L'oggetto ha più categorie L'objet a plusieurs catégories
32+
^drawings_category_legend Drawings category group Dibujos Gruppo categoria disegni Groupe de catégories de dessins
33+
^dressings_category_legend Dressings category group Vestidos Gruppo categoria medicazioni Groupe de catégories d'habillages
34+
^fabrics_category_legend Fabrics category group Tejidos Gruppo categoria tessuti Groupe de catégories de tissus
35+
^furniture_category_legend Furniture category group Mobiliario Gruppo categoria mobili Groupe de catégories de meubles
36+
^household_category_legend HouseHold Objects category group Objeto Personales Gruppo categoria oggetti HouseHold Groupe de catégories HouseHold Objets
37+
^religious_category_legend Religious Objects category group Objetos Religiosos Gruppo categoria Oggetti Religiosi Groupe de catégories Objets religieux
38+
^icons_legend Icons for object categories: Iconos para las categorías de objetos Icone per le categorie di oggetti: Icônes pour les catégories d'objets :
39+
^error_loading_data Error Loading Data Error cargando datos Errore nel caricamento dei dati Erreur de chargement des données

Assets/Resources/object_groups.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-3.46 KB
Binary file not shown.

Assets/Resources/object_groups/drawing.png.meta

Lines changed: 0 additions & 110 deletions
This file was deleted.
-4.45 KB
Binary file not shown.

0 commit comments

Comments
 (0)