Skip to content

Commit cde54a6

Browse files
NashetNashet
authored
Merge pull request #523 from Nashet/dev
Dev
2 parents 40bc606 + aa7289e commit cde54a6

Some content is hidden

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

50 files changed

+732
-529
lines changed

‎Assets/EconomicSimulation/Diagrams/GeneralClasses.cd‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717
<Class Name="Nashet.EconomicSimulation.Aristocrats" Collapsed="true">
1818
<Position X="28.5" Y="9" Width="1.5" />
1919
<TypeIdentifier>
20-
<HashCode>AAAAgAQAAAAAAAQAABAgAAAAAABAEAAgAAAAAAAQAAA=</HashCode>
20+
<HashCode>AAAAgAQAAAAAAAwAABAgAAAAAABAAAAgAAAAAAAQAAA=</HashCode>
2121
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\Aristocrats.cs</FileName>
2222
</TypeIdentifier>
2323
</Class>
2424
<Class Name="Nashet.EconomicSimulation.Artisans" Collapsed="true">
2525
<Position X="30.75" Y="7.5" Width="1.5" />
2626
<TypeIdentifier>
27-
<HashCode>AAAAAwQAAMAAgAQCABAgAAAAAABCEAAAAQAAAAQQAgA=</HashCode>
27+
<HashCode>AAAAAwQAAMAAgAwCABAgAAAAAABCAAAAAQAAAAQQAgA=</HashCode>
2828
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\Artisans.cs</FileName>
2929
</TypeIdentifier>
3030
</Class>
3131
<Class Name="Nashet.EconomicSimulation.Capitalists" Collapsed="true">
3232
<Position X="26.25" Y="9" Width="1.5" />
3333
<TypeIdentifier>
34-
<HashCode>AAAAgAQAAAAAAAQAABAgAAAAAAAAEAAAAAAAAAAQAAA=</HashCode>
34+
<HashCode>AAAAgAQAAAAAAAwAABAgAAAAAAAAAAAAAAAAAAAQAAA=</HashCode>
3535
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\Capitalists.cs</FileName>
3636
</TypeIdentifier>
3737
</Class>
3838
<Class Name="Nashet.EconomicSimulation.Farmers" Collapsed="true">
3939
<Position X="21.75" Y="7.5" Width="1.5" />
4040
<TypeIdentifier>
41-
<HashCode>AAAAAAQAAAAAAAQAABAAAAAAAABAEAAAAAAAAAAQAAA=</HashCode>
41+
<HashCode>AAAAAAQAAAAAAAwAABAAAAAAAABAAAAAAAAAAAAQAAA=</HashCode>
4242
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\Farmers.cs</FileName>
4343
</TypeIdentifier>
4444
</Class>
@@ -61,29 +61,29 @@
6161
<Class Name="Nashet.EconomicSimulation.PopUnit" Collapsed="true">
6262
<Position X="28.5" Y="4.75" Width="1.5" />
6363
<TypeIdentifier>
64-
<HashCode>QCDFgEiFMcgUQexExFAhGMECi4hREOowgaQl0C0YNCQ=</HashCode>
64+
<HashCode>QSDFgGCEMcgcQexERFAxGMECi4hZAOowgaQl0CwYNCQ=</HashCode>
6565
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\PopUnit.cs</FileName>
6666
</TypeIdentifier>
6767
<Lollipop Position="0.2" />
6868
</Class>
6969
<Class Name="Nashet.EconomicSimulation.Soldiers" Collapsed="true">
7070
<Position X="24" Y="7.5" Width="1.5" />
7171
<TypeIdentifier>
72-
<HashCode>ABAAAAQAAAAAAAQAABAAAAAAAAAAEAAAAAAAAAAQAAA=</HashCode>
72+
<HashCode>ABAAAAQAAAAAAAwAABAAAAAAAAAAAAAAAAAAAAAQAAA=</HashCode>
7373
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\Soldiers.cs</FileName>
7474
</TypeIdentifier>
7575
</Class>
7676
<Class Name="Nashet.EconomicSimulation.Tribesmen" Collapsed="true">
7777
<Position X="35.25" Y="7.5" Width="1.5" />
7878
<TypeIdentifier>
79-
<HashCode>AAAAAAQAAAAAAAQAABAgAAAAAAAAEAAAAAAAAAQQAAA=</HashCode>
79+
<HashCode>AAAAAAQAAAAAAAwAABAgAAAAAAAAAAAAAAAAAAQQAAA=</HashCode>
8080
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\Tribesmen.cs</FileName>
8181
</TypeIdentifier>
8282
</Class>
8383
<Class Name="Nashet.EconomicSimulation.Workers" Collapsed="true">
8484
<Position X="33" Y="7.5" Width="1.5" />
8585
<TypeIdentifier>
86-
<HashCode>AAAAAAQAAAAAAAQAEBAAAAAAAAAEEAAAAAAAAAAQAAA=</HashCode>
86+
<HashCode>AAAAAAQBAAAIAAwAEBAAAgAAAAAMBAAAAAACAAAQAAA=</HashCode>
8787
<FileName>Assets\EconomicSimulation\Scripts\Logic\Population\Workers.cs</FileName>
8888
</TypeIdentifier>
8989
</Class>
@@ -97,7 +97,7 @@
9797
<Class Name="Nashet.EconomicSimulation.Factory" Collapsed="true">
9898
<Position X="39.75" Y="6.25" Width="1.5" />
9999
<TypeIdentifier>
100-
<HashCode>tTGSAcZwEVRrIJJHnOMoASATrWGaYthEFJbAAqZABEY=</HashCode>
100+
<HashCode>tTGSAcZwEVRrIJJHnPMoASATrWGaYthEFJbAQqZABEY=</HashCode>
101101
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\Factory.cs</FileName>
102102
</TypeIdentifier>
103103
<Lollipop Position="0.2" />
@@ -113,8 +113,8 @@
113113
<Class Name="Nashet.EconomicSimulation.ProductionType" Collapsed="true" BaseTypeListCollapsed="true">
114114
<Position X="54.25" Y="2.5" Width="1.5" />
115115
<TypeIdentifier>
116-
<HashCode>BAKAAEABGAAMAxBEAAAEABAgAcCGAYoAYEA6AAkQABE=</HashCode>
117-
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\FactoryType.cs</FileName>
116+
<HashCode>BACAAEABGAAMAxBEAAAEABAgAcCGAYoAYEA6AAkQgBE=</HashCode>
117+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\ProductionType.cs</FileName>
118118
</TypeIdentifier>
119119
<Lollipop Position="0.2" Collapsed="true" />
120120
</Class>
@@ -156,17 +156,10 @@
156156
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\SimpleProduction.cs</FileName>
157157
</TypeIdentifier>
158158
</Class>
159-
<Class Name="Nashet.EconomicSimulation.ReformExtensions" Collapsed="true">
160-
<Position X="49" Y="3.5" Width="1.5" />
161-
<TypeIdentifier>
162-
<HashCode>AAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
163-
<FileName>Assets\EconomicSimulation\Scripts\Logic\Reforms\Reform.cs</FileName>
164-
</TypeIdentifier>
165-
</Class>
166159
<Class Name="Nashet.EconomicSimulation.Agent" Collapsed="true">
167160
<Position X="33" Y="0.5" Width="1.5" />
168161
<TypeIdentifier>
169-
<HashCode>ARAQRAQYAYQEAggMABAAQAiAgUIAAAASAAAAAAAAAAE=</HashCode>
162+
<HashCode>ARAQRAQIAYQEAggMAAAAQAiAAUIBAAASAAAAAAAAAAE=</HashCode>
170163
<FileName>Assets\EconomicSimulation\Scripts\Logic\Agent.cs</FileName>
171164
</TypeIdentifier>
172165
<Lollipop Position="0.2" />
@@ -217,7 +210,7 @@
217210
<Class Name="Nashet.EconomicSimulation.Country" Collapsed="true">
218211
<Position X="44.25" Y="6.25" Width="1.5" />
219212
<TypeIdentifier>
220-
<HashCode>uULG0AMK4rzXhoJPptnFTTLgHaFtTowBoUJH5a2oGpY=</HashCode>
213+
<HashCode>sQDCwAEK4LBQAIJPoIlESROIGYEMBsgAgFgAww2gkpY=</HashCode>
221214
<FileName>Assets\EconomicSimulation\Scripts\Logic\Country.cs</FileName>
222215
</TypeIdentifier>
223216
<Lollipop Position="0.2" />
@@ -247,15 +240,15 @@
247240
<Class Name="Nashet.EconomicSimulation.Invention" Collapsed="true" BaseTypeListCollapsed="true">
248241
<Position X="50.75" Y="1.5" Width="1.5" />
249242
<TypeIdentifier>
250-
<HashCode>ACgAwEGBAAAAAIAAJGEAGAIRAQiQAEEAiCRICAMIEmA=</HashCode>
243+
<HashCode>ACgAwEGBAAAAAIAAJGEAGAIRAQiQAEEACKRYCAEIEmA=</HashCode>
251244
<FileName>Assets\EconomicSimulation\Scripts\Logic\Invention.cs</FileName>
252245
</TypeIdentifier>
253246
<Lollipop Position="0.2" Collapsed="true" />
254247
</Class>
255248
<Class Name="Nashet.EconomicSimulation.Movement" Collapsed="true">
256249
<Position X="42" Y="4.75" Width="1.5" />
257250
<TypeIdentifier>
258-
<HashCode>AAAQAAAEACgAAICEAAQJBAAAEAWAAISBCBCAAAQCQEQ=</HashCode>
251+
<HashCode>AAAQCAAEACgAAIAEAAQJBAAAEAUAAISBCBCAAAQCQEQ=</HashCode>
259252
<FileName>Assets\EconomicSimulation\Scripts\Logic\Movement.cs</FileName>
260253
</TypeIdentifier>
261254
<Lollipop Position="0.2" />
@@ -278,23 +271,23 @@
278271
<Class Name="Nashet.EconomicSimulation.Province" Collapsed="true" BaseTypeListCollapsed="true">
279272
<Position X="56" Y="2.5" Width="1.5" />
280273
<TypeIdentifier>
281-
<HashCode>DQEBCERGoCcgGagSKwCQUCSgFYYoBBGCFMyQAFA/UA4=</HashCode>
274+
<HashCode>DQEBCARGoCcgGagSKwCQUCSgFZdoBAGCFMyQAFA9EA8=</HashCode>
282275
<FileName>Assets\EconomicSimulation\Scripts\Logic\Province.cs</FileName>
283276
</TypeIdentifier>
284277
<Lollipop Position="0.2" Collapsed="true" />
285278
</Class>
286279
<Class Name="Nashet.EconomicSimulation.Staff" Collapsed="true">
287280
<Position X="43.25" Y="3.25" Width="1.5" />
288281
<TypeIdentifier>
289-
<HashCode>AFBAACAGAIAAAAgAASAAAACgwQCEAACAAAAAQCAgAEA=</HashCode>
282+
<HashCode>AEBAACAGAIAAAAgAASAAAACgwQCEAACAAAAAQCAgAEA=</HashCode>
290283
<FileName>Assets\EconomicSimulation\Scripts\Logic\Staff.cs</FileName>
291284
</TypeIdentifier>
292285
<Lollipop Position="0.2" />
293286
</Class>
294287
<Class Name="Nashet.EconomicSimulation.World" Collapsed="true">
295288
<Position X="52.5" Y="3.5" Width="1.5" />
296289
<TypeIdentifier>
297-
<HashCode>AAIQQBAgECFABYBAosAgQIMgGYIgFGAACIAIQAAICFA=</HashCode>
290+
<HashCode>AAIQQBIgECHABYBAosAgQIMgGZIgFWAACIAIQAAICUA=</HashCode>
298291
<FileName>Assets\EconomicSimulation\Scripts\Logic\Mono\World.cs</FileName>
299292
</TypeIdentifier>
300293
</Class>

‎Assets/EconomicSimulation/ES-base.unity‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3626,6 +3626,7 @@ MonoBehaviour:
36263626
btnPlay: {fileID: 1141240135}
36273627
btnStep: {fileID: 1286130974}
36283628
btnTrade: {fileID: 685281367}
3629+
financeButton: {fileID: 996118680}
36293630
generalText: {fileID: 1505497595}
36303631
specificText: {fileID: 0}
36313632
world: {fileID: 984703830}
@@ -22093,7 +22094,7 @@ MonoBehaviour:
2209322094
m_Name:
2209422095
m_EditorClassIdentifier:
2209522096
text:
22096-
isDynamic: 0
22097+
isDynamic: 1
2209722098
--- !u!1 &1003814264
2209822099
GameObject:
2209922100
m_ObjectHideFlags: 0

‎Assets/EconomicSimulation/Prefabs/Windows/DebugWindow.prefab‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ GameObject:
249249
- component: {fileID: 222802433676590114}
250250
- component: {fileID: 114570758784703466}
251251
- component: {fileID: 114238468841070394}
252+
- component: {fileID: 114632837570560524}
252253
m_Layer: 5
253254
m_Name: RichectAgents
254255
m_TagString: Untagged
@@ -275,7 +276,7 @@ GameObject:
275276
m_Icon: {fileID: 0}
276277
m_NavMeshLayer: 0
277278
m_StaticEditorFlags: 0
278-
m_IsActive: 1
279+
m_IsActive: 0
279280
--- !u!1 &1464287978395498
280281
GameObject:
281282
m_ObjectHideFlags: 1
@@ -329,7 +330,7 @@ GameObject:
329330
m_Icon: {fileID: 0}
330331
m_NavMeshLayer: 0
331332
m_StaticEditorFlags: 0
332-
m_IsActive: 1
333+
m_IsActive: 0
333334
--- !u!1 &1612326375140732
334335
GameObject:
335336
m_ObjectHideFlags: 1
@@ -401,7 +402,7 @@ GameObject:
401402
m_Icon: {fileID: 0}
402403
m_NavMeshLayer: 0
403404
m_StaticEditorFlags: 0
404-
m_IsActive: 1
405+
m_IsActive: 0
405406
--- !u!1 &1666280238517874
406407
GameObject:
407408
m_ObjectHideFlags: 1
@@ -507,7 +508,7 @@ GameObject:
507508
m_Icon: {fileID: 0}
508509
m_NavMeshLayer: 0
509510
m_StaticEditorFlags: 0
510-
m_IsActive: 1
511+
m_IsActive: 0
511512
--- !u!1 &1865797743901884
512513
GameObject:
513514
m_ObjectHideFlags: 1
@@ -1621,7 +1622,7 @@ MonoBehaviour:
16211622
m_HorizontalOverflow: 0
16221623
m_VerticalOverflow: 0
16231624
m_LineSpacing: 1
1624-
m_Text: Richest agents
1625+
m_Text: Richest agents (hover mouse)
16251626
--- !u!114 &114591104312298102
16261627
MonoBehaviour:
16271628
m_ObjectHideFlags: 1
@@ -1734,6 +1735,19 @@ MonoBehaviour:
17341735
m_FillAmount: 1
17351736
m_FillClockwise: 1
17361737
m_FillOrigin: 0
1738+
--- !u!114 &114632837570560524
1739+
MonoBehaviour:
1740+
m_ObjectHideFlags: 1
1741+
m_PrefabParentObject: {fileID: 0}
1742+
m_PrefabInternal: {fileID: 100100000}
1743+
m_GameObject: {fileID: 1395595823579136}
1744+
m_Enabled: 1
1745+
m_EditorHideFlags: 0
1746+
m_Script: {fileID: 11500000, guid: 99f87c8e4381dd140816922f1be162f7, type: 3}
1747+
m_Name:
1748+
m_EditorClassIdentifier:
1749+
text:
1750+
isDynamic: 0
17371751
--- !u!114 &114642107148425866
17381752
MonoBehaviour:
17391753
m_ObjectHideFlags: 1
@@ -2484,10 +2498,10 @@ RectTransform:
24842498
m_Father: {fileID: 224221413402231180}
24852499
m_RootOrder: 9
24862500
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2487-
m_AnchorMin: {x: 0, y: 0}
2488-
m_AnchorMax: {x: 0, y: 0}
2489-
m_AnchoredPosition: {x: 0, y: 0}
2490-
m_SizeDelta: {x: 0, y: 0}
2501+
m_AnchorMin: {x: 0, y: 1}
2502+
m_AnchorMax: {x: 0, y: 1}
2503+
m_AnchoredPosition: {x: 3, y: -334.05554}
2504+
m_SizeDelta: {x: 392, y: 30}
24912505
m_Pivot: {x: 0, y: 0}
24922506
--- !u!224 &224060835955636416
24932507
RectTransform:
@@ -2503,10 +2517,10 @@ RectTransform:
25032517
m_Father: {fileID: 224221413402231180}
25042518
m_RootOrder: 7
25052519
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2506-
m_AnchorMin: {x: 0, y: 0}
2507-
m_AnchorMax: {x: 0, y: 0}
2508-
m_AnchoredPosition: {x: 0, y: 0}
2509-
m_SizeDelta: {x: 0, y: 0}
2520+
m_AnchorMin: {x: 0, y: 1}
2521+
m_AnchorMax: {x: 0, y: 1}
2522+
m_AnchoredPosition: {x: 3, y: -274.05554}
2523+
m_SizeDelta: {x: 392, y: 30}
25102524
m_Pivot: {x: 0, y: 0}
25112525
--- !u!224 &224083168818422748
25122526
RectTransform:
@@ -2541,10 +2555,10 @@ RectTransform:
25412555
m_Father: {fileID: 224221413402231180}
25422556
m_RootOrder: 10
25432557
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2544-
m_AnchorMin: {x: 0, y: 0}
2545-
m_AnchorMax: {x: 0, y: 0}
2546-
m_AnchoredPosition: {x: 0, y: 0}
2547-
m_SizeDelta: {x: 0, y: 0}
2558+
m_AnchorMin: {x: 0, y: 1}
2559+
m_AnchorMax: {x: 0, y: 1}
2560+
m_AnchoredPosition: {x: 3, y: -364.05554}
2561+
m_SizeDelta: {x: 392, y: 30}
25482562
m_Pivot: {x: 0, y: 0}
25492563
--- !u!224 &224177712732333394
25502564
RectTransform:
@@ -3072,8 +3086,8 @@ RectTransform:
30723086
m_Father: {fileID: 224221413402231180}
30733087
m_RootOrder: 8
30743088
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3075-
m_AnchorMin: {x: 0, y: 0}
3076-
m_AnchorMax: {x: 0, y: 0}
3077-
m_AnchoredPosition: {x: 0, y: 0}
3078-
m_SizeDelta: {x: 0, y: 0}
3089+
m_AnchorMin: {x: 0, y: 1}
3090+
m_AnchorMax: {x: 0, y: 1}
3091+
m_AnchoredPosition: {x: 3, y: -304.05554}
3092+
m_SizeDelta: {x: 392, y: 30}
30793093
m_Pivot: {x: 0, y: 0}

0 commit comments

Comments
 (0)