Skip to content

Commit 69ea75d

Browse files
committed
[change] namespace && class name
1 parent 1914f4a commit 69ea75d

14 files changed

+86
-33
lines changed

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,15 @@ sysinfo.txt
5858

5959
# Builds
6060
*.apk
61+
*.aab
6162
*.unitypackage
6263

6364
# Crashlytics generated file
64-
crashlytics-build.properties
65+
crashlytics-build.properties
66+
67+
# Packed Addressables
68+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
69+
70+
# Temporary auto-generated Android Assets
71+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
72+
/[Aa]ssets/[Ss]treamingAssets/aa/*

.vsconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Workload.ManagedGame"
5+
]
6+
}
File renamed without changes.
File renamed without changes.

Assets/JenkinsBuild/Editor/ToolBuild.cs renamed to Assets/Jenkins/Editor/BuildMenu.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
using UnityEditor;
33
using UnityEngine;
44

5-
namespace JenkinsBuild
5+
namespace hyhy.Jenkins
66
{
7-
public class ToolBuild : MonoBehaviour
7+
public class BuildMenu : MonoBehaviour
88
{
9-
private static string SavePath
9+
private static string BuildFolder
1010
{
1111
get { return Directory.GetParent(Application.dataPath).FullName.Replace('\\', '/') + "/Builds"; }
1212
}
1313

1414
[MenuItem("Builds/Android")]
15-
public static void BuildAndroidTaiwan()
15+
public static void BuildAndroid()
1616
{
17-
JenkinsBuild.BuildAndroid(SavePath);
17+
Jenkins.BuildAndroid(BuildFolder);
1818
}
1919

2020
[MenuItem("Builds/iOS")]
21-
public static void TestBuildiOS()
21+
public static void BuildiOS()
2222
{
23-
JenkinsBuild.BuildiOS(SavePath);
23+
Jenkins.BuildiOS(BuildFolder);
2424
}
2525
}
2626
}

Assets/JenkinsBuild/Editor/JenkinsBuild.cs renamed to Assets/Jenkins/Editor/Jenkins.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using UnityEditor;
66
using UnityEngine;
77

8-
namespace JenkinsBuild
8+
namespace hyhy.Jenkins
99
{
10-
public class JenkinsBuild
10+
public class Jenkins
1111
{
1212
private static readonly string GameName = PlayerSettings.productName;
1313
private static readonly string GameVersion = Application.version.Replace(".", "");
@@ -115,7 +115,7 @@ public static void BuildAndroid(string location)
115115
locationPathName = path,
116116
target = BuildTarget.Android
117117
};
118-
var keystore = Resources.Load<AndroidKeyStore>("AndroidKeyStore");
118+
var keystore = Resources.Load<KeyStore>("AndroidKeyStore");
119119
if (keystore != null)
120120
{
121121
PlayerSettings.Android.keystoreName = keystore.KeystoreName;

Assets/JenkinsBuild/Editor/JenkinsBuild.cs.meta renamed to Assets/Jenkins/Editor/Jenkins.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/JenkinsBuild/Editor/AndroidKeyStoreEditor.cs renamed to Assets/Jenkins/Editor/KeyStoreEditor.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
using UnityEditor;
22
using UnityEngine;
33

4-
namespace JenkinsBuild
4+
namespace hyhy.Jenkins
55
{
6-
[CustomEditor(typeof(AndroidKeyStore))]
7-
public class AndroidKeyStoreEditor : Editor
6+
[CustomEditor(typeof(KeyStore))]
7+
public class KeyStoreEditor : Editor
88
{
99
private float labelWidth = 125f;
10-
private AndroidKeyStore m_Target;
10+
private KeyStore m_Target;
1111

1212
private void OnEnable()
1313
{
14-
m_Target = (AndroidKeyStore)target;
14+
m_Target = (KeyStore)target;
1515
}
1616

1717
public override void OnInspectorGUI()

Assets/JenkinsBuild/AndroidKeyStore.cs renamed to Assets/Jenkins/KeyStore.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using UnityEngine;
22

3-
namespace JenkinsBuild
3+
namespace hyhy.Jenkins
44
{
55
[CreateAssetMenu(fileName = "AndroidKeyStore", menuName = "JenkinsBuild/Creat AndroidKeyStore", order = 1)]
6-
public class AndroidKeyStore : ScriptableObject
6+
public class KeyStore : ScriptableObject
77
{
88
public string KeystoreName;
99
public string KeystorePassword;

Assets/Scenes/SampleScene.unity

Lines changed: 52 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ LightmapSettings:
5050
m_BounceScale: 1
5151
m_IndirectOutputScale: 1
5252
m_AlbedoBoost: 1
53-
m_TemporalCoherenceThreshold: 1
5453
m_EnvironmentLightingMode: 0
5554
m_EnableBakedLightmaps: 1
5655
m_EnableRealtimeLightmaps: 1
5756
m_LightmapEditorSettings:
58-
serializedVersion: 10
57+
serializedVersion: 12
5958
m_Resolution: 2
6059
m_BakeResolution: 40
6160
m_AtlasSize: 1024
6261
m_AO: 0
6362
m_AOMaxDistance: 1
6463
m_CompAOExponent: 1
6564
m_CompAOExponentDirect: 0
65+
m_ExtractAmbientOcclusion: 0
6666
m_Padding: 2
6767
m_LightmapParameters: {fileID: 0}
6868
m_LightmapsBakeMode: 1
@@ -77,18 +77,26 @@ LightmapSettings:
7777
m_PVRDirectSampleCount: 32
7878
m_PVRSampleCount: 500
7979
m_PVRBounces: 2
80+
m_PVREnvironmentSampleCount: 500
81+
m_PVREnvironmentReferencePointCount: 2048
82+
m_PVRFilteringMode: 2
83+
m_PVRDenoiserTypeDirect: 0
84+
m_PVRDenoiserTypeIndirect: 0
85+
m_PVRDenoiserTypeAO: 0
8086
m_PVRFilterTypeDirect: 0
8187
m_PVRFilterTypeIndirect: 0
8288
m_PVRFilterTypeAO: 0
83-
m_PVRFilteringMode: 1
89+
m_PVREnvironmentMIS: 0
8490
m_PVRCulling: 1
8591
m_PVRFilteringGaussRadiusDirect: 1
8692
m_PVRFilteringGaussRadiusIndirect: 5
8793
m_PVRFilteringGaussRadiusAO: 2
8894
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
8995
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9096
m_PVRFilteringAtrousPositionSigmaAO: 1
91-
m_ShowResolutionOverlay: 1
97+
m_ExportTrainingData: 0
98+
m_TrainingDataDestination: TrainingData
99+
m_LightProbeSampleCountMultiplier: 4
92100
m_LightingDataAsset: {fileID: 0}
93101
m_UseShadowmask: 1
94102
--- !u!196 &4
@@ -117,7 +125,8 @@ NavMeshSettings:
117125
GameObject:
118126
m_ObjectHideFlags: 0
119127
m_CorrespondingSourceObject: {fileID: 0}
120-
m_PrefabInternal: {fileID: 0}
128+
m_PrefabInstance: {fileID: 0}
129+
m_PrefabAsset: {fileID: 0}
121130
serializedVersion: 6
122131
m_Component:
123132
- component: {fileID: 705507995}
@@ -133,15 +142,18 @@ GameObject:
133142
Light:
134143
m_ObjectHideFlags: 0
135144
m_CorrespondingSourceObject: {fileID: 0}
136-
m_PrefabInternal: {fileID: 0}
145+
m_PrefabInstance: {fileID: 0}
146+
m_PrefabAsset: {fileID: 0}
137147
m_GameObject: {fileID: 705507993}
138148
m_Enabled: 1
139-
serializedVersion: 8
149+
serializedVersion: 10
140150
m_Type: 1
151+
m_Shape: 0
141152
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
142153
m_Intensity: 1
143154
m_Range: 10
144155
m_SpotAngle: 30
156+
m_InnerSpotAngle: 21.80208
145157
m_CookieSize: 10
146158
m_Shadows:
147159
m_Type: 2
@@ -151,26 +163,48 @@ Light:
151163
m_Bias: 0.05
152164
m_NormalBias: 0.4
153165
m_NearPlane: 0.2
166+
m_CullingMatrixOverride:
167+
e00: 1
168+
e01: 0
169+
e02: 0
170+
e03: 0
171+
e10: 0
172+
e11: 1
173+
e12: 0
174+
e13: 0
175+
e20: 0
176+
e21: 0
177+
e22: 1
178+
e23: 0
179+
e30: 0
180+
e31: 0
181+
e32: 0
182+
e33: 1
183+
m_UseCullingMatrixOverride: 0
154184
m_Cookie: {fileID: 0}
155185
m_DrawHalo: 0
156186
m_Flare: {fileID: 0}
157187
m_RenderMode: 0
158188
m_CullingMask:
159189
serializedVersion: 2
160190
m_Bits: 4294967295
191+
m_RenderingLayerMask: 1
161192
m_Lightmapping: 1
162193
m_LightShadowCasterMode: 0
163194
m_AreaSize: {x: 1, y: 1}
164195
m_BounceIntensity: 1
165196
m_ColorTemperature: 6570
166197
m_UseColorTemperature: 0
198+
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
199+
m_UseBoundingSphereOverride: 0
167200
m_ShadowRadius: 0
168201
m_ShadowAngle: 0
169202
--- !u!4 &705507995
170203
Transform:
171204
m_ObjectHideFlags: 0
172205
m_CorrespondingSourceObject: {fileID: 0}
173-
m_PrefabInternal: {fileID: 0}
206+
m_PrefabInstance: {fileID: 0}
207+
m_PrefabAsset: {fileID: 0}
174208
m_GameObject: {fileID: 705507993}
175209
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
176210
m_LocalPosition: {x: 0, y: 3, z: 0}
@@ -183,7 +217,8 @@ Transform:
183217
GameObject:
184218
m_ObjectHideFlags: 0
185219
m_CorrespondingSourceObject: {fileID: 0}
186-
m_PrefabInternal: {fileID: 0}
220+
m_PrefabInstance: {fileID: 0}
221+
m_PrefabAsset: {fileID: 0}
187222
serializedVersion: 6
188223
m_Component:
189224
- component: {fileID: 963194228}
@@ -200,23 +235,26 @@ GameObject:
200235
AudioListener:
201236
m_ObjectHideFlags: 0
202237
m_CorrespondingSourceObject: {fileID: 0}
203-
m_PrefabInternal: {fileID: 0}
238+
m_PrefabInstance: {fileID: 0}
239+
m_PrefabAsset: {fileID: 0}
204240
m_GameObject: {fileID: 963194225}
205241
m_Enabled: 1
206242
--- !u!20 &963194227
207243
Camera:
208244
m_ObjectHideFlags: 0
209245
m_CorrespondingSourceObject: {fileID: 0}
210-
m_PrefabInternal: {fileID: 0}
246+
m_PrefabInstance: {fileID: 0}
247+
m_PrefabAsset: {fileID: 0}
211248
m_GameObject: {fileID: 963194225}
212249
m_Enabled: 1
213250
serializedVersion: 2
214251
m_ClearFlags: 1
215252
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
216253
m_projectionMatrixMode: 1
254+
m_GateFitMode: 2
255+
m_FOVAxisMode: 0
217256
m_SensorSize: {x: 36, y: 24}
218257
m_LensShift: {x: 0, y: 0}
219-
m_GateFitMode: 2
220258
m_FocalLength: 50
221259
m_NormalizedViewPortRect:
222260
serializedVersion: 2
@@ -248,7 +286,8 @@ Camera:
248286
Transform:
249287
m_ObjectHideFlags: 0
250288
m_CorrespondingSourceObject: {fileID: 0}
251-
m_PrefabInternal: {fileID: 0}
289+
m_PrefabInstance: {fileID: 0}
290+
m_PrefabAsset: {fileID: 0}
252291
m_GameObject: {fileID: 963194225}
253292
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
254293
m_LocalPosition: {x: 0, y: 1, z: -10}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# UnityJenkinsBuild
1+
# UnityJenkins
22

33
此為使用 Jenkins 輸出 Unity 專案注意事項。
44

0 commit comments

Comments
 (0)