diff --git a/Assets/GWConquest/Prefabs/District.prefab b/Assets/GWConquest/Prefabs/District.prefab index ca4e031..075aea5 100644 --- a/Assets/GWConquest/Prefabs/District.prefab +++ b/Assets/GWConquest/Prefabs/District.prefab @@ -75,9 +75,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 0 DefaultSprite: {fileID: 0} - DistrictName: Primus - Description: + DistrictName: MissingName DistrictType: 0 DistrictLevel: 0 --- !u!114 &2620233160227347941 diff --git a/Assets/GWConquest/Prefabs/Factory.prefab b/Assets/GWConquest/Prefabs/Factory.prefab index e81cad5..555135b 100644 --- a/Assets/GWConquest/Prefabs/Factory.prefab +++ b/Assets/GWConquest/Prefabs/Factory.prefab @@ -62,7 +62,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3097d18430809bc4db1e8e075e8199a2, type: 3} m_Name: m_EditorClassIdentifier: - Tier: 1 StartsBroken: 0 SpecialUnits: [] --- !u!114 &7954319019618919355 @@ -77,10 +76,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: - DefaultSprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} - DistrictName: Primus - Description: + DistrictStatic: 0 + DefaultSprite: {fileID: 0} + DistrictName: MissingName DistrictType: 0 + DistrictLevel: 0 --- !u!114 &3732992427129260454 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 0525960..53d6b75 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -1206,6 +1206,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &23218206 stripped @@ -1334,6 +1339,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &24269501 stripped @@ -1851,6 +1861,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -2574,9 +2589,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &40190439 @@ -2744,6 +2759,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -3997,6 +4017,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -4355,6 +4380,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -4618,6 +4648,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -5125,9 +5160,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District II - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &86848884 @@ -6068,6 +6103,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &98901663 stripped @@ -6755,6 +6795,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &106048186 stripped @@ -6888,6 +6933,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &107022880 stripped @@ -7758,6 +7808,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -7820,9 +7875,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District II - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &113413690 @@ -7995,6 +8050,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -8143,6 +8203,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -8807,6 +8872,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &128250850 stripped @@ -9325,9 +9395,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District I - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &131868900 @@ -9646,6 +9716,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &152693679 stripped @@ -9784,6 +9859,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -10428,6 +10508,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 5 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &169501540 stripped @@ -11047,6 +11132,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -11180,6 +11270,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &178539814 stripped @@ -12271,6 +12366,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &194966926 stripped @@ -12468,6 +12568,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -12932,6 +13037,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &204592875 stripped @@ -13238,9 +13348,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &214596037 @@ -13403,6 +13513,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &214790440 stripped @@ -13577,6 +13692,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -13720,6 +13840,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -14168,6 +14293,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &227127232 stripped @@ -14511,6 +14641,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -16615,6 +16750,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 4 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &280599956 stripped @@ -17737,6 +17877,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &300692101 stripped @@ -17873,9 +18018,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &302288826 @@ -18043,6 +18188,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &302396707 stripped @@ -19052,6 +19202,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -19250,9 +19405,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &322489094 @@ -20285,6 +20440,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &352729205 stripped @@ -20356,9 +20516,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &353074288 @@ -22076,6 +22236,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -22202,6 +22367,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &376316692 stripped @@ -22438,6 +22608,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &378059171 stripped @@ -22833,6 +23008,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &386818640 stripped @@ -23475,6 +23655,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -23787,6 +23972,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 6 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &404225705 stripped @@ -26674,6 +26864,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &433700570 stripped @@ -27042,6 +27237,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 8 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &442428675 stripped @@ -27947,6 +28147,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &465157246 stripped @@ -28278,6 +28483,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &480260777 stripped @@ -28449,6 +28659,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &482339412 stripped @@ -30073,6 +30288,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 7 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &514590777 stripped @@ -30282,6 +30502,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &527812914 stripped @@ -31360,6 +31585,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -32013,6 +32243,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &562736686 stripped @@ -32399,6 +32634,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &584400547 stripped @@ -33751,6 +33991,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &631875716 stripped @@ -34979,6 +35224,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &648993311 stripped @@ -35208,6 +35458,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -35920,6 +36175,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &666988008 stripped @@ -36425,6 +36685,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &668557531 stripped @@ -37362,6 +37627,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 4941434942006963670, guid: ff49bfd3e408771468b4722c5fde646d, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ff49bfd3e408771468b4722c5fde646d, type: 3} --- !u!114 &688425248 stripped @@ -39071,6 +39341,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -39197,6 +39472,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &711118086 stripped @@ -40379,6 +40659,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &730144879 stripped @@ -41133,6 +41418,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -41791,6 +42081,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -41924,6 +42219,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &746598770 stripped @@ -42227,6 +42527,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &748518605 stripped @@ -42599,9 +42904,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &755114448 @@ -42834,6 +43139,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &755950720 stripped @@ -43803,9 +44113,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &769496622 @@ -44327,9 +44637,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District II - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &776571280 @@ -44657,6 +44967,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 4 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -45203,6 +45518,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -45346,6 +45666,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &802156722 stripped @@ -45805,6 +46130,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &809681771 stripped @@ -45966,6 +46296,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &811853420 stripped @@ -46569,6 +46904,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &817933647 stripped @@ -46702,6 +47042,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &820682954 stripped @@ -46881,6 +47226,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &825453001 stripped @@ -46983,9 +47333,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District III - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &829595064 @@ -47158,6 +47508,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -48254,9 +48609,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &853110023 @@ -49208,6 +49563,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &882008043 stripped @@ -49354,9 +49714,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &884239768 @@ -52724,6 +53084,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &918984398 stripped @@ -52981,6 +53346,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -53099,6 +53469,11 @@ PrefabInstance: propertyPath: DistrictType value: 6 objectReference: {fileID: 0} + - target: {fileID: 4941434942006963670, guid: ff49bfd3e408771468b4722c5fde646d, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ff49bfd3e408771468b4722c5fde646d, type: 3} --- !u!114 &935980425 stripped @@ -54189,6 +54564,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -54322,6 +54702,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &960426613 stripped @@ -54460,6 +54845,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -56017,6 +56407,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &984576232 stripped @@ -56562,6 +56957,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &995091233 stripped @@ -59192,6 +59592,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1035984751 stripped @@ -59874,6 +60279,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -61325,6 +61735,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -61699,6 +62114,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1086078787 stripped @@ -61962,6 +62382,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1089369626 stripped @@ -62227,9 +62652,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 21300000, guid: 8cc0e0c4f06ba004fb7ba3358f07744f, type: 3} DistrictName: Agri-District I - Description: DistrictType: 5 DistrictLevel: 3 --- !u!114 &1091417642 @@ -62479,6 +62904,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -62622,6 +63052,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -65089,6 +65524,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -65541,6 +65981,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -66201,9 +66646,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &1147370008 @@ -66566,6 +67011,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -67122,9 +67572,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &1166148167 @@ -67278,6 +67728,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1166602517 stripped @@ -68970,6 +69425,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1190436986 stripped @@ -69108,6 +69568,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -69640,9 +70105,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &1213153681 @@ -69810,6 +70275,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -70272,9 +70742,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &1229600187 @@ -72329,9 +72799,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &1267657457 @@ -73150,6 +73620,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1286070051 stripped @@ -73915,6 +74390,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1313371802 stripped @@ -79122,6 +79602,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -79769,6 +80254,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1327566365 stripped @@ -80777,6 +81267,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 5 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1351593814 stripped @@ -81640,6 +82135,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -81932,6 +82432,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1387429196 stripped @@ -82603,9 +83108,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District II - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &1409165553 @@ -82768,6 +83273,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1411249166 stripped @@ -82825,9 +83335,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 21300000, guid: 8cc0e0c4f06ba004fb7ba3358f07744f, type: 3} DistrictName: Agri-District II - Description: DistrictType: 5 DistrictLevel: 3 --- !u!114 &1412114075 @@ -83441,6 +83951,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -83886,6 +84401,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -84294,6 +84814,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1441824905 stripped @@ -85165,6 +85690,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 4 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1458547176 stripped @@ -85460,6 +85990,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1463892857 stripped @@ -85633,6 +86168,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1466975628 stripped @@ -86244,6 +86784,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -87046,6 +87591,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -87685,6 +88235,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -87747,9 +88302,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &1497715127 @@ -89197,6 +89752,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1537498017 stripped @@ -90538,6 +91098,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1579585384 stripped @@ -91341,6 +91906,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1591325463 stripped @@ -91570,6 +92140,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1595006263 stripped @@ -91917,6 +92492,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1608899189 stripped @@ -92212,6 +92792,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1619047937 stripped @@ -93257,6 +93842,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1638880093 stripped @@ -93390,6 +93980,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1643675083 stripped @@ -94441,9 +95036,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District II - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &1658452144 @@ -96083,6 +96678,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: IsCityDistrict @@ -96466,6 +97066,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -96808,6 +97413,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1701081521 stripped @@ -97651,9 +98261,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &1724478289 @@ -97996,6 +98606,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -99273,6 +99888,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -99449,9 +100069,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District I - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &1758196033 @@ -99932,6 +100552,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: StartsBroken @@ -100473,6 +101098,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1767646830 stripped @@ -101205,6 +101835,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 4 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1776615351 stripped @@ -101489,6 +102124,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 3 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -106865,6 +107505,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -107087,6 +107732,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -107228,9 +107878,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &1798405256 @@ -107718,6 +108368,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1809378649 stripped @@ -109375,9 +110030,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Special District - Description: DistrictType: 6 DistrictLevel: 0 --- !u!114 &1846341752 @@ -109632,6 +110287,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -110844,6 +111504,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 4 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1876272394 stripped @@ -110972,6 +111637,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1880169449 stripped @@ -111824,6 +112494,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1907230640 stripped @@ -111962,6 +112637,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -113140,6 +113820,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -113328,6 +114013,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1924025789 stripped @@ -113464,9 +114154,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &1924742659 @@ -113978,6 +114668,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -114298,9 +114993,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &1947037425 @@ -114552,9 +115247,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District I - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &1952294460 @@ -114973,6 +115668,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -116561,6 +117261,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &1972101503 stripped @@ -116868,6 +117573,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -117026,9 +117736,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District I - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &1976539134 @@ -117201,6 +117911,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -119977,6 +120692,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &2028621360 stripped @@ -120475,9 +121195,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District I - Description: DistrictType: 5 DistrictLevel: 2 --- !u!114 &2042552056 @@ -121103,6 +121823,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 2 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -121693,6 +122418,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!114 &2071669521 stripped @@ -122899,6 +123629,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: StartsBroken @@ -124263,6 +124998,11 @@ PrefabInstance: propertyPath: DefaultSprite value: objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: FactoryType @@ -124502,6 +125242,11 @@ PrefabInstance: propertyPath: DistrictLevel value: 1 objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictStatic + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: Tier @@ -124789,9 +125534,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} m_Name: m_EditorClassIdentifier: + DistrictStatic: 1 DefaultSprite: {fileID: 0} DistrictName: Agri-District - Description: DistrictType: 5 DistrictLevel: 1 --- !u!114 &2141017712 diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index 8dbb28c..57a75f4 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -10,21 +10,35 @@ namespace GWConquest { public static List AllDistricts = new List(); + public bool DistrictStatic; + public Sprite DefaultSprite; public string DistrictName; - public string Description; - public DistrictType DistrictType = DistrictType.Civil; public int DistrictLevel; - public Zone Zone { get; private set; } + private Zone _zone; + public Zone Zone { + get { + if(_zone == null) + { + _zone = GetComponent(); + } + return _zone; + } + } public static bool IsTypeFactory(DistrictType type) { return type == DistrictType.Civil || type == DistrictType.SpaceStation || type == DistrictType.FactoryArmor || type == DistrictType.FactoryInfantry || type == DistrictType.FactorySupplies || type == DistrictType.FactoryFuel; } + public Planet Planet { + get => State.Planet?.GetComponent(); + set => State.Planet = value.entity; + } + public Player ControllingPlayer { get { var id = State.ControllingPlayerId; @@ -61,19 +75,12 @@ namespace GWConquest set => State.StorageCapacity = value; } - private void Start() - { - Zone = GetComponent(); - } - public override void Attached() { if(entity.IsOwner) { StorageCapacity = GameManager.Instance.DefaultStorageCapacity; State.ControllingPlayerId = -1; - - State.ZoneID = Zone.GetZoneId(GetComponent()); } Inventory = new Inventory(State, "Inventory"); @@ -84,6 +91,50 @@ namespace GWConquest //BoltLog.Info("Setting storage capacity to {0}", StorageCapacity); AllDistricts.Add(this); + + if(DistrictStatic) + { + if(entity.IsOwner) + { + State.ZoneID = Zone.GetZoneId(GetComponent()); + State.DistrictType = (int) DistrictType; + State.DistrictName = DistrictName; + State.Level = DistrictLevel; + State.Planet = GetComponentInParent().entity; + } + } + } + + public void InitNonStatic() + { + if(DistrictType == DistrictType.SpaceStation) + { + Zone.zoneType = ZoneType.Space; + Util.ArrayAppend(ref Planet.spaceZones, Zone); + } + else { + Zone.zoneType = ZoneType.Ground; + Util.ArrayAppend(ref Planet.groundZones, Zone); + } + + if(entity.IsOwner) + { + State.ZoneID = Zone.GetZoneId(GetComponent()); + State.DistrictType = (int) DistrictType; + State.DistrictName = DistrictName; + State.Level = DistrictLevel; + State.RelativePosition = transform.localPosition; + } + else { + Zone.SetZoneId(State.ZoneID); + DistrictType = (DistrictType) State.DistrictType; + DistrictName = State.DistrictName; + DistrictLevel = state.Level; + + transform.SetParent(Planet.transform, false); + transform.localPosition = State.RelativePosition; + gameObject.name = DistrictName; + } } public virtual Sprite GetCurrentSprite() @@ -104,7 +155,7 @@ namespace GWConquest public virtual string GetDescription() { - return GetComponentInParent().PlanetData?.Description; + return Planet.PlanetData?.Description; } public string ProducingItem { diff --git a/Assets/GWConquest/Scripts/DistrictFactory.cs b/Assets/GWConquest/Scripts/DistrictFactory.cs index 84652d4..f9c0a0e 100644 --- a/Assets/GWConquest/Scripts/DistrictFactory.cs +++ b/Assets/GWConquest/Scripts/DistrictFactory.cs @@ -29,7 +29,7 @@ namespace GWConquest public IEnumerable GetAvailableUnitClasses() { - var classes = UnitClass.AllUnitClasses.Where(uc => uc.FactoryType == FactoryType && uc.MinFactoryTier <= District.DistrictLevel); + var classes = UnitClass.AllUnitClasses.Where(uc => uc.FactoryType == FactoryType && uc.MinFactoryTier <= District.DistrictLevel+1); var special = SpecialUnits.ToList().ConvertAll(name => UnitClass.FromName(name)); return classes.Union(special); } diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs index 7875e6f..e22b8cb 100644 --- a/Assets/GWConquest/Scripts/GameManager.cs +++ b/Assets/GWConquest/Scripts/GameManager.cs @@ -121,7 +121,7 @@ namespace GWConquest private IEnumerator EntitiesLoadedAsync() { - yield return new WaitForSecondsRealtime(0.1f); + yield return new WaitForSecondsRealtime(1f); yield return new WaitForFixedUpdate(); EntitiesLoaded = true; @@ -153,6 +153,14 @@ namespace GWConquest } } + foreach(District d in FindObjectsOfType()) + { + if(!d.DistrictStatic) + { + d.InitNonStatic(); + } + } + foreach(Planet planet in allPlanets) { planet.FinishSetup(); diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index 983f54e..604e399 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -626,6 +626,7 @@ namespace GWConquest d.DistrictType = districtData.DistrictType; d.DistrictName = districtData.Name; d.DistrictLevel = districtData.Rating; + d.DistrictStatic = true; UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(d); @@ -691,6 +692,7 @@ namespace GWConquest d.DistrictType = DistrictType.SpaceStation; d.DistrictName = planetName + " Station"; d.DistrictLevel = data.ShipyardRating; + d.DistrictStatic = true; UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(d); } diff --git a/Assets/GWConquest/Scripts/PlanetPlacement.cs b/Assets/GWConquest/Scripts/PlanetPlacement.cs index e297e80..6eb5e61 100644 --- a/Assets/GWConquest/Scripts/PlanetPlacement.cs +++ b/Assets/GWConquest/Scripts/PlanetPlacement.cs @@ -217,12 +217,41 @@ namespace GWConquest var district = go.GetComponent(); district.DistrictType = type; + district.DistrictLevel = Random.Range(0, 2); + + var alreadyPresentNames = planet.GetComponentsInChildren().Select(d => d.DistrictName); + + for(int i = 0; i < PlanetRegistry.CivilNames.Length; i++) + { + string nameCandidate; + if(type == DistrictType.Civil) + { + nameCandidate = planet.State.PlanetName + " " + PlanetRegistry.CivilNames[i]; + } + else + { + nameCandidate = type == DistrictType.Food ? "Agri-District" : "Factory Complex"; + if(i > 0) + { + nameCandidate += " " + PlanetRegistry.DistrictNames[i]; + } + } + + if(!alreadyPresentNames.Contains(nameCandidate)) + { + district.DistrictName = nameCandidate; + break; + } + } + go.name = district.DistrictName; var zone = go.GetComponent(); zone.SetZoneId(nextZoneId); zone.zoneType = ZoneType.Ground; nextZoneId++; + district.Planet = planet; + district.InitNonStatic(); } public void SpawnAsteroids(Planet planet) diff --git a/Assets/GWConquest/Scripts/PlanetRegistry.cs b/Assets/GWConquest/Scripts/PlanetRegistry.cs index 418ce24..fe35d58 100644 --- a/Assets/GWConquest/Scripts/PlanetRegistry.cs +++ b/Assets/GWConquest/Scripts/PlanetRegistry.cs @@ -29,8 +29,8 @@ namespace GWConquest public class PlanetRegistry { - private static string[] CivilNames = new string[] { "Prime", "Secundi", "Tri", "For" }; - private static string[] DistrictNames = new string[] { "I", "II", "III", "IV" }; + public static string[] CivilNames = new string[] { "Prime", "Secundi", "Tri", "For" }; + public static string[] DistrictNames = new string[] { "I", "II", "III", "IV" }; private static Dictionary planetDataMap; diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll index 7cc6d9d..26b6956 100644 Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll differ diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb index 4f30b99..f3f06a5 100644 Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb differ diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json index 1e573f6..ad2025f 100644 --- a/Assets/Photon/PhotonBolt/project.json +++ b/Assets/Photon/PhotonBolt/project.json @@ -2329,6 +2329,107 @@ "ExtrapolationMaxFrames": 9, "SnapMagnitude": 10.0 } + }, + { + "Name": "Level", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Photon.Bolt.Compiler.PropertyTypeInteger, bolt.compiler", + "MaxValue": 255 + }, + "AssetSettings": { + "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + }, + { + "Name": "DistrictType", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Photon.Bolt.Compiler.PropertyTypeInteger, bolt.compiler", + "MaxValue": 255 + }, + "AssetSettings": { + "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + }, + { + "Name": "DistrictName", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Photon.Bolt.Compiler.PropertyTypeString, bolt.compiler", + "MaxLength": 1 + }, + "AssetSettings": { + "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + }, + { + "Name": "RelativePosition", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Photon.Bolt.Compiler.PropertyTypeVector, bolt.compiler", + "Selection": 14, + "Compression": [ + { + "MinValue": -1024, + "MaxValue": 1024, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 1024.0, + "BitsRequired": 18 + }, + { + "MinValue": -1024, + "MaxValue": 1024, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 1024.0, + "BitsRequired": 18 + }, + { + "MinValue": -1024, + "MaxValue": 1024, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 1024.0, + "BitsRequired": 18 + } + ] + }, + "AssetSettings": { + "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } } ], "PacketMaxBits": 512, diff --git a/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset b/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset index 1fbbca9..eeb218d 100644 --- a/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset +++ b/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset @@ -50,7 +50,7 @@ MonoBehaviour: debugStartPort: 54321 debugBuildMode: 1 debugStartMapName: GalaxyMap - debugPlayAsServer: 1 + debugPlayAsServer: 0 showDebugInfo: 0 overrideTimeScale: 1 debugEditorMode: 1 diff --git a/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs b/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs index 30b3d25..118c744 100644 --- a/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs +++ b/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs @@ -90,9 +90,9 @@ end tell'"; private IEnumerator DelayClientConnect() { - for (int i = 0; i < 8; i++) + for (int i = 0; i < 10; i++) { - BoltLog.Info("Connecting in {0} seconds...", 8 - i); + BoltLog.Info("Connecting in {0} seconds...", 10 - i); yield return new WaitForSeconds(1); }