Skip to content

Commit 8b34bf6

Browse files
author
DESKTOP-UBV38B7\codingworks
committed
准备增加dataTable模块
1 parent 1d94243 commit 8b34bf6

16 files changed

+310
-167
lines changed

‎Assets/GameFramework/DataTable.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameFramework/DataTable/DataTableManager.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//-----------------------------------------------------------------------
2+
// <copyright>
3+
// Copyright (c) 2018 Zhang Yang. All rights reserved.
4+
// </copyright>
5+
// <describe> #配置文件管理类# </describe>
6+
// <email> [email protected] </email>
7+
// <time> #2018年6月28日 16点03分# </time>
8+
//-----------------------------------------------------------------------
9+
10+
using System.Collections;
11+
using System.Collections.Generic;
12+
13+
namespace GameFramework.Taurus
14+
{
15+
public sealed class DataTableManager : GameFrameworkModule
16+
{
17+
//
18+
//private Dictionary<string,I>
19+
20+
public void LoadDataTable<T>(string dataTable) where T :class, IDataTableRow,new()
21+
{
22+
23+
}
24+
25+
26+
27+
28+
public override void OnClose()
29+
{
30+
}
31+
}
32+
}

‎Assets/GameFramework/DataTable/DataTableManager.cs.meta

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameFramework/DataTable/IDataTable.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//-----------------------------------------------------------------------
2+
// <copyright>
3+
// Copyright (c) 2018 Zhang Yang. All rights reserved.
4+
// </copyright>
5+
// <describe> #配置文件管理类# </describe>
6+
// <email> [email protected] </email>
7+
// <time> #2018年6月28日 16点03分# </time>
8+
//-----------------------------------------------------------------------
9+
10+
using System.Collections;
11+
using System.Collections.Generic;
12+
13+
namespace GameFramework.Taurus
14+
{
15+
16+
public interface IDataTable<T> where T : IDataTableRow
17+
{
18+
19+
}
20+
}

‎Assets/GameFramework/DataTable/IDataTable.cs.meta

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameFramework/DataTable/IDataTableRow.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//-----------------------------------------------------------------------
2+
// <copyright>
3+
// Copyright (c) 2018 Zhang Yang. All rights reserved.
4+
// </copyright>
5+
// <describe> #配置文件的行解析# </describe>
6+
// <email> [email protected] </email>
7+
// <time> #2018年6月28日 11点56分# </time>
8+
//-----------------------------------------------------------------------
9+
10+
namespace GameFramework.Taurus
11+
{
12+
public interface IDataTableRow
13+
{
14+
/// <summary>
15+
/// Id
16+
/// </summary>
17+
int Id { get; }
18+
19+
/// <summary>
20+
/// 解析当前数据的接口
21+
/// </summary>
22+
/// <param name="data"></param>
23+
void ParseRowData(string data);
24+
}
25+
}

‎Assets/GameFramework/DataTable/IDataTableRow.cs.meta

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ProjectSettings/AudioManager.asset

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,4 @@ AudioManager:
1111
m_DSPBufferSize: 0
1212
m_VirtualVoiceCount: 512
1313
m_RealVoiceCount: 32
14-
m_SpatializerPlugin:
15-
m_AmbisonicDecoderPlugin:
1614
m_DisableAudio: 0
17-
m_VirtualizeEffects: 1

‎ProjectSettings/EditorSettings.asset

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,10 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 5
7-
m_ExternalVersionControlSupport: Hidden Meta Files
6+
serializedVersion: 3
7+
m_ExternalVersionControlSupport: Visible Meta Files
88
m_SerializationMode: 2
9+
m_WebSecurityEmulationEnabled: 0
10+
m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
911
m_DefaultBehaviorMode: 0
10-
m_SpritePackerMode: 0
11-
m_SpritePackerPaddingPower: 1
12-
m_EtcTextureCompressorBehavior: 1
13-
m_EtcTextureFastCompressor: 1
14-
m_EtcTextureNormalCompressor: 2
15-
m_EtcTextureBestCompressor: 4
16-
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
17-
m_ProjectGenerationRootNamespace:
18-
m_UserGeneratedProjectSuffix:
19-
m_CollabEditorSettings:
20-
inProgressEnabled: 1
12+
m_SpritePackerMode: 2

‎ProjectSettings/GraphicsSettings.asset

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!30 &1
44
GraphicsSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 12
6+
serializedVersion: 7
77
m_Deferred:
88
m_Mode: 1
99
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -33,29 +33,35 @@ GraphicsSettings:
3333
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
3434
- {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
3535
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
36-
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
3736
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
37+
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
3838
m_PreloadedShaders: []
3939
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4040
type: 0}
41-
m_CustomRenderPipeline: {fileID: 0}
42-
m_TransparencySortMode: 0
43-
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
44-
m_DefaultRenderingPath: 1
45-
m_DefaultMobileRenderingPath: 1
46-
m_TierSettings: []
41+
m_ShaderSettings_Tier1:
42+
useCascadedShadowMaps: 1
43+
standardShaderQuality: 2
44+
useReflectionProbeBoxProjection: 1
45+
useReflectionProbeBlending: 1
46+
m_ShaderSettings_Tier2:
47+
useCascadedShadowMaps: 1
48+
standardShaderQuality: 2
49+
useReflectionProbeBoxProjection: 1
50+
useReflectionProbeBlending: 1
51+
m_ShaderSettings_Tier3:
52+
useCascadedShadowMaps: 1
53+
standardShaderQuality: 2
54+
useReflectionProbeBoxProjection: 1
55+
useReflectionProbeBlending: 1
56+
m_BuildTargetShaderSettings: []
4757
m_LightmapStripping: 0
4858
m_FogStripping: 0
49-
m_InstancingStripping: 0
5059
m_LightmapKeepPlain: 1
5160
m_LightmapKeepDirCombined: 1
61+
m_LightmapKeepDirSeparate: 1
5262
m_LightmapKeepDynamicPlain: 1
5363
m_LightmapKeepDynamicDirCombined: 1
54-
m_LightmapKeepShadowMask: 1
55-
m_LightmapKeepSubtractive: 1
64+
m_LightmapKeepDynamicDirSeparate: 1
5665
m_FogKeepLinear: 1
5766
m_FogKeepExp: 1
5867
m_FogKeepExp2: 1
59-
m_AlbedoSwatchInfos: []
60-
m_LightsUseLinearIntensity: 0
61-
m_LightsUseColorTemperature: 0

‎ProjectSettings/InputManager.asset

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ InputManager:
1414
altNegativeButton: a
1515
altPositiveButton: d
1616
gravity: 3
17-
dead: 0.001
17+
dead: .00100000005
1818
sensitivity: 3
1919
snap: 1
2020
invert: 0
@@ -30,7 +30,7 @@ InputManager:
3030
altNegativeButton: s
3131
altPositiveButton: w
3232
gravity: 3
33-
dead: 0.001
33+
dead: .00100000005
3434
sensitivity: 3
3535
snap: 1
3636
invert: 0
@@ -46,7 +46,7 @@ InputManager:
4646
altNegativeButton:
4747
altPositiveButton: mouse 0
4848
gravity: 1000
49-
dead: 0.001
49+
dead: .00100000005
5050
sensitivity: 1000
5151
snap: 0
5252
invert: 0
@@ -62,7 +62,7 @@ InputManager:
6262
altNegativeButton:
6363
altPositiveButton: mouse 1
6464
gravity: 1000
65-
dead: 0.001
65+
dead: .00100000005
6666
sensitivity: 1000
6767
snap: 0
6868
invert: 0
@@ -74,11 +74,11 @@ InputManager:
7474
descriptiveName:
7575
descriptiveNegativeName:
7676
negativeButton:
77-
positiveButton: left shift
77+
positiveButton: left cmd
7878
altNegativeButton:
7979
altPositiveButton: mouse 2
8080
gravity: 1000
81-
dead: 0.001
81+
dead: .00100000005
8282
sensitivity: 1000
8383
snap: 0
8484
invert: 0
@@ -94,7 +94,7 @@ InputManager:
9494
altNegativeButton:
9595
altPositiveButton:
9696
gravity: 1000
97-
dead: 0.001
97+
dead: .00100000005
9898
sensitivity: 1000
9999
snap: 0
100100
invert: 0
@@ -111,7 +111,7 @@ InputManager:
111111
altPositiveButton:
112112
gravity: 0
113113
dead: 0
114-
sensitivity: 0.1
114+
sensitivity: .100000001
115115
snap: 0
116116
invert: 0
117117
type: 1
@@ -127,7 +127,7 @@ InputManager:
127127
altPositiveButton:
128128
gravity: 0
129129
dead: 0
130-
sensitivity: 0.1
130+
sensitivity: .100000001
131131
snap: 0
132132
invert: 0
133133
type: 1
@@ -143,7 +143,7 @@ InputManager:
143143
altPositiveButton:
144144
gravity: 0
145145
dead: 0
146-
sensitivity: 0.1
146+
sensitivity: .100000001
147147
snap: 0
148148
invert: 0
149149
type: 1
@@ -158,7 +158,7 @@ InputManager:
158158
altNegativeButton:
159159
altPositiveButton:
160160
gravity: 0
161-
dead: 0.19
161+
dead: .189999998
162162
sensitivity: 1
163163
snap: 0
164164
invert: 0
@@ -174,7 +174,7 @@ InputManager:
174174
altNegativeButton:
175175
altPositiveButton:
176176
gravity: 0
177-
dead: 0.19
177+
dead: .189999998
178178
sensitivity: 1
179179
snap: 0
180180
invert: 1
@@ -190,7 +190,7 @@ InputManager:
190190
altNegativeButton:
191191
altPositiveButton:
192192
gravity: 1000
193-
dead: 0.001
193+
dead: .00100000005
194194
sensitivity: 1000
195195
snap: 0
196196
invert: 0
@@ -206,7 +206,7 @@ InputManager:
206206
altNegativeButton:
207207
altPositiveButton:
208208
gravity: 1000
209-
dead: 0.001
209+
dead: .00100000005
210210
sensitivity: 1000
211211
snap: 0
212212
invert: 0
@@ -222,7 +222,7 @@ InputManager:
222222
altNegativeButton:
223223
altPositiveButton:
224224
gravity: 1000
225-
dead: 0.001
225+
dead: .00100000005
226226
sensitivity: 1000
227227
snap: 0
228228
invert: 0
@@ -238,7 +238,7 @@ InputManager:
238238
altNegativeButton:
239239
altPositiveButton:
240240
gravity: 1000
241-
dead: 0.001
241+
dead: .00100000005
242242
sensitivity: 1000
243243
snap: 0
244244
invert: 0
@@ -254,7 +254,7 @@ InputManager:
254254
altNegativeButton:
255255
altPositiveButton: joystick button 0
256256
gravity: 1000
257-
dead: 0.001
257+
dead: .00100000005
258258
sensitivity: 1000
259259
snap: 0
260260
invert: 0
@@ -270,7 +270,7 @@ InputManager:
270270
altNegativeButton:
271271
altPositiveButton: space
272272
gravity: 1000
273-
dead: 0.001
273+
dead: .00100000005
274274
sensitivity: 1000
275275
snap: 0
276276
invert: 0
@@ -286,7 +286,7 @@ InputManager:
286286
altNegativeButton:
287287
altPositiveButton: joystick button 1
288288
gravity: 1000
289-
dead: 0.001
289+
dead: .00100000005
290290
sensitivity: 1000
291291
snap: 0
292292
invert: 0

0 commit comments

Comments
 (0)