Skip to content

Commit 34a6caf

Browse files
NashetNashet
authored
Merge pull request #480 from Nashet/ver.0.20
Ver 0 20
2 parents 87dc961 + bf1eff0 commit 34a6caf

Some content is hidden

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

56 files changed

+1232
-890
lines changed

‎Assets/DebugWindow.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ private void Start()
2929
Exist = true;
3030
devModeToggle.isOn = Game.devMode;
3131
logInvestmentsToggle.isOn = Game.logInvestments;
32+
logMarketFailsToggle.isOn = Game.logMarket;
3233
}
3334

3435
public override void Hide()
@@ -48,6 +49,8 @@ public void OnLogInvestmentsChange(bool value)
4849
}
4950

5051
public void OnLogMarketFailsChange(bool value)
51-
{ }
52+
{
53+
Game.logMarket = value;
54+
}
5255
}
5356
}

‎Assets/EconomicSimulation/ClassDiagram.cd‎

Lines changed: 125 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,168 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ClassDiagram MajorVersion="1" MinorVersion="1">
3-
<Class Name="Agent" Collapsed="true">
4-
<Position X="7.25" Y="0.5" Width="1.5" />
3+
<Class Name="Nashet.EconomicSimulation.ArtisanProduction" Collapsed="true">
4+
<Position X="12.5" Y="6.75" Width="1.5" />
55
<TypeIdentifier>
6-
<HashCode>FAgABQESABAEIAMsCIAEAAAAgYAAEAAQAAAAAAQABAI=</HashCode>
7-
<FileName>Assets\code\Logic\Agent.cs</FileName>
6+
<HashCode>AAIAAIQAAAAAAAACAAAAAAAAAAAAAAAAAAAAACQAAAA=</HashCode>
7+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\ArtisanProduction.cs</FileName>
88
</TypeIdentifier>
9-
<Lollipop Position="0.2" />
109
</Class>
11-
<Class Name="Bank">
12-
<Position X="0.5" Y="1.75" Width="1.5" />
13-
<Compartments>
14-
<Compartment Name="Methods" Collapsed="true" />
15-
<Compartment Name="Fields" Collapsed="true" />
16-
</Compartments>
10+
<Class Name="Nashet.EconomicSimulation.Factory" Collapsed="true" BaseTypeListCollapsed="true">
11+
<Position X="14.75" Y="6.75" Width="1.5" />
1712
<TypeIdentifier>
18-
<HashCode>AAAAAAAAACAAiAAGAAAABEAECQBAAABAAAAAAEACACA=</HashCode>
19-
<FileName>Assets\code\Logic\Bank.cs</FileName>
13+
<HashCode>tTGSAcZwEVRrIJJHnOMoASATrWGaYthEFJbAAqZABEY=</HashCode>
14+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\Factory.cs</FileName>
2015
</TypeIdentifier>
16+
<Lollipop Position="0.2" Collapsed="true" />
2117
</Class>
22-
<Class Name="Market">
23-
<Position X="2.75" Y="1.75" Width="1.5" />
24-
<Compartments>
25-
<Compartment Name="Fields" Collapsed="true" />
26-
<Compartment Name="Methods" Collapsed="true" />
27-
</Compartments>
18+
<Class Name="Nashet.EconomicSimulation.Producer" Collapsed="true">
19+
<Position X="13.5" Y="3.75" Width="1.5" />
2820
<TypeIdentifier>
29-
<HashCode>ABIAgBUCAgCIABCAQCGKABABSQACFQAEgAEAQEAAACA=</HashCode>
30-
<FileName>Assets\code\Logic\Market.cs</FileName>
21+
<HashCode>AAAAAAQAEIBAAAAAABAAAAAAAMACEACAAAgCAwAAAAI=</HashCode>
22+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\Producer.cs</FileName>
3123
</TypeIdentifier>
24+
<Lollipop Position="0.2" />
3225
</Class>
33-
<Class Name="Producer">
34-
<Position X="7.25" Y="3.25" Width="1.5" />
35-
<Compartments>
36-
<Compartment Name="Methods" Collapsed="true" />
37-
<Compartment Name="Fields" Collapsed="true" />
38-
</Compartments>
26+
<Class Name="Nashet.EconomicSimulation.Agent" Collapsed="true">
27+
<Position X="13.5" Y="1" Width="1.5" />
3928
<TypeIdentifier>
40-
<HashCode>AEAAAAQAEABAAAAAABAAAAAAAMACEACAAAgCAQAAAAA=</HashCode>
41-
<FileName>Assets\code\Logic\Producer.cs</FileName>
29+
<HashCode>ARAQRAQYAYQEAggMABAAQAiAgUIAAAASAAAAAAAAAAE=</HashCode>
30+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Agent.cs</FileName>
4231
</TypeIdentifier>
4332
<Lollipop Position="0.2" />
4433
</Class>
45-
<Class Name="Staff">
46-
<Position X="13" Y="3.25" Width="1.5" />
47-
<Compartments>
48-
<Compartment Name="Fields" Collapsed="true" />
49-
<Compartment Name="Methods" Collapsed="true" />
50-
</Compartments>
34+
<Class Name="Nashet.EconomicSimulation.Consumer" Collapsed="true">
35+
<Position X="11.25" Y="2.25" Width="1.5" />
5136
<TypeIdentifier>
52-
<HashCode>ABAAACBGAAAAAAAAAyIAAAAgwYCAQAAIAACAQDAAAAQ=</HashCode>
53-
<FileName>Assets\code\Logic\Staff.cs</FileName>
37+
<HashCode>AAAAABQIgIAAIIAAAAAAAAACAAAAAAAAAAAABCQAAAA=</HashCode>
38+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Consumer.cs</FileName>
5439
</TypeIdentifier>
5540
</Class>
56-
<Class Name="Movement">
57-
<Position X="14" Y="5.25" Width="1.5" />
58-
<Compartments>
59-
<Compartment Name="Fields" Collapsed="true" />
60-
<Compartment Name="Methods" Collapsed="true" />
61-
</Compartments>
41+
<Class Name="Nashet.EconomicSimulation.Corps" Collapsed="true">
42+
<Position X="23.5" Y="1" Width="1.5" />
6243
<TypeIdentifier>
63-
<HashCode>AAAAAAAAACggAIAEAAQIBAAAEQWAAAQBCACEAAQCQUA=</HashCode>
64-
<FileName>Assets\code\Logic\Movement.cs</FileName>
44+
<HashCode>CAgAQAgFAIAKAEAEAIEAAAAAAIEAAAAAEQAAAIAiBAA=</HashCode>
45+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Corp.cs</FileName>
6546
</TypeIdentifier>
6647
</Class>
67-
<Class Name="PopUnit" Collapsed="true">
68-
<Position X="9.5" Y="5.25" Width="1.5" />
69-
<Compartments>
70-
<Compartment Name="Methods" Collapsed="true" />
71-
</Compartments>
48+
<Class Name="Nashet.EconomicSimulation.CorpsPool" Collapsed="true">
49+
<Position X="25.25" Y="1" Width="1.5" />
7250
<TypeIdentifier>
73-
<HashCode>cOHUgECEEQgGY2RGBFAhPsACi4BUkSpwqSQEVi0YFyQ=</HashCode>
74-
<FileName>Assets\code\Logic\PopUnit.cs</FileName>
51+
<HashCode>AAAAAAAAAAABIAAAAABAAAAAAAAAAEAAAAAAAAAAAAA=</HashCode>
52+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Corp.cs</FileName>
7553
</TypeIdentifier>
76-
<Lollipop Position="0.2" />
7754
</Class>
78-
<Class Name="ArtisanProduction">
79-
<Position X="7.25" Y="7.25" Width="1.5" />
80-
<Compartments>
81-
<Compartment Name="Methods" Collapsed="true" />
82-
</Compartments>
83-
<TypeIdentifier>
84-
<HashCode>AAgAgIQAAAAAAAACAAAAAAAAAAAAAAAAAAAAACQAAAA=</HashCode>
85-
<FileName>Assets\code\Logic\ArtisanProduction.cs</FileName>
86-
</TypeIdentifier>
87-
</Class>
88-
<Class Name="Factory">
89-
<Position X="5" Y="7.25" Width="1.5" />
90-
<Compartments>
91-
<Compartment Name="Methods" Collapsed="true" />
92-
<Compartment Name="Fields" Collapsed="true" />
93-
</Compartments>
94-
<NestedTypes>
95-
<Enum Name="Factory.Priority" Collapsed="true">
96-
<TypeIdentifier>
97-
<NewMemberFileName>Assets\code\Logic\Factory.cs</NewMemberFileName>
98-
</TypeIdentifier>
99-
</Enum>
100-
</NestedTypes>
101-
<TypeIdentifier>
102-
<HashCode>lTGYAcZwEFRroJIHzKMpATATrSGaIsBEFJJAEqZQDAQ=</HashCode>
103-
<FileName>Assets\code\Logic\Factory.cs</FileName>
55+
<Class Name="Nashet.EconomicSimulation.Country" Collapsed="true">
56+
<Position X="10.25" Y="6.75" Width="1.5" />
57+
<TypeIdentifier>
58+
<HashCode>ucLH0AMK4rzXhorOptvVTTLADaFtTowAoUJG7S2gGJY=</HashCode>
59+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Country.cs</FileName>
10460
</TypeIdentifier>
10561
<Lollipop Position="0.2" />
10662
</Class>
107-
<Class Name="SimpleProduction">
108-
<Position X="6.25" Y="5.25" Width="1.5" />
109-
<Compartments>
110-
<Compartment Name="Fields" Collapsed="true" />
111-
<Compartment Name="Methods" Collapsed="true" />
112-
</Compartments>
63+
<Class Name="Nashet.EconomicSimulation.Movement" Collapsed="true">
64+
<Position X="8" Y="5.25" Width="1.5" />
11365
<TypeIdentifier>
114-
<HashCode>AEgIgYQAAAABgAAGAAAAAEgAAYABAAAAEAAAACAAAAA=</HashCode>
115-
<FileName>Assets\code\Logic\SimpleProduction.cs</FileName>
66+
<HashCode>AAAAAAAAACgAAICEAAQIBAAAEQWAAIQBCACAAAQCQUQ=</HashCode>
67+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Movement.cs</FileName>
11668
</TypeIdentifier>
69+
<Lollipop Position="0.2" />
11770
</Class>
118-
<Class Name="Consumer" Collapsed="true">
119-
<Position X="9.5" Y="1.75" Width="1.5" />
71+
<Class Name="Nashet.EconomicSimulation.MultiSeller" Collapsed="true">
72+
<Position X="10.25" Y="5.25" Width="1.5" />
12073
<TypeIdentifier>
121-
<HashCode>AAAAABQIgAAAIIAAAAAAAAACAIAAAAAAAAAABCQAAAA=</HashCode>
122-
<FileName>Assets\code\Logic\Consumer.cs</FileName>
74+
<HashCode>gAAABAAAgIBAAAaAIBAAAABCAAAAEAAECAgSAAgAgEA=</HashCode>
75+
<FileName>Assets\EconomicSimulation\Scripts\Logic\MultiSeller.cs</FileName>
12376
</TypeIdentifier>
77+
<Lollipop Position="0.2" />
12478
</Class>
125-
<Class Name="Country" Collapsed="true">
126-
<Position X="11.75" Y="6.75" Width="1.5" />
127-
<Compartments>
128-
<Compartment Name="Fields" Collapsed="true" />
129-
<Compartment Name="Methods" Collapsed="true" />
130-
</Compartments>
79+
<Class Name="Nashet.EconomicSimulation.Staff" Collapsed="true">
80+
<Position X="9" Y="3.75" Width="1.5" />
13181
<TypeIdentifier>
132-
<HashCode>mMACwA8o6Lj2hgrOrJrVTX7AH6EtDlgQoEJOjDWimLY=</HashCode>
133-
<FileName>Assets\code\Logic\Country.cs</FileName>
82+
<HashCode>AFAAACBGAIAAAAAAAyIAAAAgwQCEAACAAACAQCAAAAA=</HashCode>
83+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Staff.cs</FileName>
13484
</TypeIdentifier>
13585
<Lollipop Position="0.2" />
13686
</Class>
137-
<Class Name="MultiSeller" Collapsed="true">
138-
<Position X="11.75" Y="5.25" Width="1.5" />
87+
<Class Name="Nashet.EconomicSimulation.NewFactoryProject" Collapsed="true" BaseTypeListCollapsed="true">
88+
<Position X="21.75" Y="2" Width="1.5" />
89+
<TypeIdentifier>
90+
<HashCode>AAACAEAAAAAAAAAAAAAAAAAAAQIAAAAAAQAAAgAAAAI=</HashCode>
91+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\FactoryProject.cs</FileName>
92+
</TypeIdentifier>
93+
<Lollipop Position="0.2" Collapsed="true" />
94+
</Class>
95+
<Class Name="Nashet.EconomicSimulation.ProductionType" Collapsed="true" BaseTypeListCollapsed="true">
96+
<Position X="23.5" Y="2" Width="1.5" />
97+
<TypeIdentifier>
98+
<HashCode>BAKAAEABGAAMAwBEAAAEABAgAcCGAYoAYEA6AAkQABE=</HashCode>
99+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\FactoryType.cs</FileName>
100+
</TypeIdentifier>
101+
<Lollipop Position="0.2" Collapsed="true" />
102+
</Class>
103+
<Class Name="Nashet.EconomicSimulation.SimpleProduction" Collapsed="true">
104+
<Position X="13.5" Y="5.25" Width="1.5" />
139105
<TypeIdentifier>
140-
<HashCode>gAAABAAAAABAAAaAIBAAAABCAIAAEAAECAgSAAgAgEA=</HashCode>
141-
<FileName>Assets\code\Logic\MultiSeller.cs</FileName>
106+
<HashCode>AAAIAYQAAIABAAAGAAAAAEgAAQABAAAAEQAAACAAAAA=</HashCode>
107+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Production\SimpleProduction.cs</FileName>
108+
</TypeIdentifier>
109+
</Class>
110+
<Class Name="Nashet.EconomicSimulation.Bank" Collapsed="true">
111+
<Position X="19.25" Y="2.25" Width="1.5" />
112+
<TypeIdentifier>
113+
<HashCode>AIAgAAAACAAAAIAEAAIAAEAAIzIEAIAIAQCAAgAAACA=</HashCode>
114+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Bank.cs</FileName>
142115
</TypeIdentifier>
143116
<Lollipop Position="0.2" />
144117
</Class>
118+
<Class Name="Nashet.EconomicSimulation.Army" Collapsed="true">
119+
<Position X="21.75" Y="1" Width="1.5" />
120+
<TypeIdentifier>
121+
<HashCode>CAg0wAgHAYAAgECEAAAgBAgIAMSCAAKCAEZERECiQQA=</HashCode>
122+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Army.cs</FileName>
123+
</TypeIdentifier>
124+
</Class>
125+
<Class Name="Nashet.EconomicSimulation.Market" Collapsed="true">
126+
<Position X="17" Y="2.25" Width="1.5" />
127+
<TypeIdentifier>
128+
<HashCode>ABIAgBUAAoCIABCUQCGKAAABSQACFQAAgAEAQEQAACA=</HashCode>
129+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Market.cs</FileName>
130+
</TypeIdentifier>
131+
</Class>
132+
<Interface Name="Nashet.EconomicSimulation.ICanSell" Collapsed="true">
133+
<Position X="21.75" Y="3.25" Width="1.5" />
134+
<TypeIdentifier>
135+
<HashCode>AAAAAAAAAABAAAAAABAAAAAAAAAAAAAAAAgAAAAAAAA=</HashCode>
136+
<FileName>Assets\EconomicSimulation\Scripts\Logic\MultiSeller.cs</FileName>
137+
</TypeIdentifier>
138+
</Interface>
139+
<Interface Name="Nashet.EconomicSimulation.IHasCountry" Collapsed="true">
140+
<Position X="7.5" Y="7" Width="1.5" />
141+
<TypeIdentifier>
142+
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAA=</HashCode>
143+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
144+
</TypeIdentifier>
145+
</Interface>
146+
<Interface Name="Nashet.EconomicSimulation.IHasGetProvince" Collapsed="true">
147+
<Position X="17.5" Y="7" Width="1.5" />
148+
<TypeIdentifier>
149+
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAA=</HashCode>
150+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
151+
</TypeIdentifier>
152+
</Interface>
153+
<Interface Name="Nashet.EconomicSimulation.IWayOfLifeChange" Collapsed="true">
154+
<Position X="23.5" Y="3.25" Width="1.5" />
155+
<TypeIdentifier>
156+
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAA=</HashCode>
157+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
158+
</TypeIdentifier>
159+
</Interface>
160+
<Interface Name="Nashet.EconomicSimulation.IInvestable" Collapsed="true">
161+
<Position X="7.5" Y="8.25" Width="1.5" />
162+
<TypeIdentifier>
163+
<HashCode>AAACAEAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAA=</HashCode>
164+
<FileName>Assets\EconomicSimulation\Scripts\Logic\Interfaces.cs</FileName>
165+
</TypeIdentifier>
166+
</Interface>
145167
<Font Name="Segoe UI" Size="9" />
146168
</ClassDiagram>

‎Assets/EconomicSimulation/ES-base.unity‎

14.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)