Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit edf562f

Browse files
coding2233coding2233
committed
Merge branch 'master' of https://github.com/coding2233/UnityGameFramework into xLua
2 parents 03198d1 + 6fde340 commit edf562f

File tree

160 files changed

+37432
-602
lines changed

Some content is hidden

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

160 files changed

+37432
-602
lines changed

‎Assets/Game/Prefab/GameMode.prefab

Lines changed: 199 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1001 &100100000
4-
Prefab:
5-
m_ObjectHideFlags: 1
6-
serializedVersion: 2
7-
m_Modification:
8-
m_TransformParent: {fileID: 0}
9-
m_Modifications: []
10-
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
12-
m_RootGameObject: {fileID: 1277301084493480}
13-
m_IsPrefabParent: 1
143
--- !u!1 &1277301084493480
154
GameObject:
165
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
18-
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
2010
m_Component:
2111
- component: {fileID: 4562670104751656}
2212
- component: {fileID: 114793819130240308}
@@ -29,22 +19,25 @@ GameObject:
2919
m_IsActive: 1
3020
--- !u!4 &4562670104751656
3121
Transform:
32-
m_ObjectHideFlags: 1
33-
m_PrefabParentObject: {fileID: 0}
34-
m_PrefabInternal: {fileID: 100100000}
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
3526
m_GameObject: {fileID: 1277301084493480}
3627
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3728
m_LocalPosition: {x: 0, y: 0, z: 0}
3829
m_LocalScale: {x: 1, y: 1, z: 1}
39-
m_Children: []
30+
m_Children:
31+
- {fileID: 6469922353199246102}
4032
m_Father: {fileID: 0}
4133
m_RootOrder: 0
4234
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4335
--- !u!114 &114793819130240308
4436
MonoBehaviour:
45-
m_ObjectHideFlags: 1
46-
m_PrefabParentObject: {fileID: 0}
47-
m_PrefabInternal: {fileID: 100100000}
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
4841
m_GameObject: {fileID: 1277301084493480}
4942
m_Enabled: 1
5043
m_EditorHideFlags: 0
@@ -55,3 +48,188 @@ MonoBehaviour:
5548
LocalPathType: 0
5649
ResUpdatePath:
5750
DebugEnable: 1
51+
--- !u!1001 &6469922353212718786
52+
PrefabInstance:
53+
m_ObjectHideFlags: 0
54+
serializedVersion: 2
55+
m_Modification:
56+
m_TransformParent: {fileID: 4562670104751656}
57+
m_Modifications:
58+
- target: {fileID: 177638, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
59+
propertyPath: m_Name
60+
value: '[Graphy]'
61+
objectReference: {fileID: 0}
62+
- target: {fileID: 177638, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
63+
propertyPath: m_IsActive
64+
value: 0
65+
objectReference: {fileID: 0}
66+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
67+
propertyPath: m_LocalPosition.x
68+
value: 0
69+
objectReference: {fileID: 0}
70+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
71+
propertyPath: m_LocalPosition.y
72+
value: 0
73+
objectReference: {fileID: 0}
74+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
75+
propertyPath: m_LocalPosition.z
76+
value: 0
77+
objectReference: {fileID: 0}
78+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
79+
propertyPath: m_LocalRotation.x
80+
value: 0
81+
objectReference: {fileID: 0}
82+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
83+
propertyPath: m_LocalRotation.y
84+
value: 0
85+
objectReference: {fileID: 0}
86+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
87+
propertyPath: m_LocalRotation.z
88+
value: 0
89+
objectReference: {fileID: 0}
90+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
91+
propertyPath: m_LocalRotation.w
92+
value: 1
93+
objectReference: {fileID: 0}
94+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
95+
propertyPath: m_RootOrder
96+
value: 0
97+
objectReference: {fileID: 0}
98+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
99+
propertyPath: m_LocalEulerAnglesHint.x
100+
value: 0
101+
objectReference: {fileID: 0}
102+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
103+
propertyPath: m_LocalEulerAnglesHint.y
104+
value: 0
105+
objectReference: {fileID: 0}
106+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
107+
propertyPath: m_LocalEulerAnglesHint.z
108+
value: 0
109+
objectReference: {fileID: 0}
110+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
111+
propertyPath: m_AnchoredPosition.x
112+
value: 0
113+
objectReference: {fileID: 0}
114+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
115+
propertyPath: m_AnchoredPosition.y
116+
value: 0
117+
objectReference: {fileID: 0}
118+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
119+
propertyPath: m_SizeDelta.x
120+
value: 0
121+
objectReference: {fileID: 0}
122+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
123+
propertyPath: m_SizeDelta.y
124+
value: 0
125+
objectReference: {fileID: 0}
126+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
127+
propertyPath: m_AnchorMin.x
128+
value: 0
129+
objectReference: {fileID: 0}
130+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
131+
propertyPath: m_AnchorMin.y
132+
value: 0
133+
objectReference: {fileID: 0}
134+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
135+
propertyPath: m_AnchorMax.x
136+
value: 0
137+
objectReference: {fileID: 0}
138+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
139+
propertyPath: m_AnchorMax.y
140+
value: 0
141+
objectReference: {fileID: 0}
142+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
143+
propertyPath: m_Pivot.x
144+
value: 0
145+
objectReference: {fileID: 0}
146+
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
147+
propertyPath: m_Pivot.y
148+
value: 0
149+
objectReference: {fileID: 0}
150+
- target: {fileID: 224000010937413736, guid: 0abab5bb77339e4428787a870eb31bd3,
151+
type: 3}
152+
propertyPath: m_AnchoredPosition.x
153+
value: 0
154+
objectReference: {fileID: 0}
155+
- target: {fileID: 224000011192146308, guid: 0abab5bb77339e4428787a870eb31bd3,
156+
type: 3}
157+
propertyPath: m_AnchoredPosition.x
158+
value: 0
159+
objectReference: {fileID: 0}
160+
- target: {fileID: 224000011192146308, guid: 0abab5bb77339e4428787a870eb31bd3,
161+
type: 3}
162+
propertyPath: m_AnchoredPosition.y
163+
value: 0
164+
objectReference: {fileID: 0}
165+
- target: {fileID: 224000010628903916, guid: 0abab5bb77339e4428787a870eb31bd3,
166+
type: 3}
167+
propertyPath: m_AnchoredPosition.x
168+
value: 0.12501526
169+
objectReference: {fileID: 0}
170+
- target: {fileID: 224000010628903916, guid: 0abab5bb77339e4428787a870eb31bd3,
171+
type: 3}
172+
propertyPath: m_AnchoredPosition.y
173+
value: 0.42485046
174+
objectReference: {fileID: 0}
175+
- target: {fileID: 224000011886223928, guid: 0abab5bb77339e4428787a870eb31bd3,
176+
type: 3}
177+
propertyPath: m_AnchoredPosition.x
178+
value: 0.024978638
179+
objectReference: {fileID: 0}
180+
- target: {fileID: 224000011886223928, guid: 0abab5bb77339e4428787a870eb31bd3,
181+
type: 3}
182+
propertyPath: m_AnchoredPosition.y
183+
value: 0.0000038146973
184+
objectReference: {fileID: 0}
185+
- target: {fileID: 224000010565031288, guid: 0abab5bb77339e4428787a870eb31bd3,
186+
type: 3}
187+
propertyPath: m_AnchoredPosition.x
188+
value: 0.024932861
189+
objectReference: {fileID: 0}
190+
- target: {fileID: 224000010243477314, guid: 0abab5bb77339e4428787a870eb31bd3,
191+
type: 3}
192+
propertyPath: m_AnchoredPosition.x
193+
value: -0.19995117
194+
objectReference: {fileID: 0}
195+
- target: {fileID: 224000010243477314, guid: 0abab5bb77339e4428787a870eb31bd3,
196+
type: 3}
197+
propertyPath: m_AnchoredPosition.y
198+
value: 11.599998
199+
objectReference: {fileID: 0}
200+
- target: {fileID: 22465754, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
201+
propertyPath: m_AnchoredPosition.x
202+
value: -0.19995117
203+
objectReference: {fileID: 0}
204+
- target: {fileID: 22439978, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
205+
propertyPath: m_AnchoredPosition.x
206+
value: -0.19995117
207+
objectReference: {fileID: 0}
208+
- target: {fileID: 22445198, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
209+
propertyPath: m_AnchoredPosition.x
210+
value: -0.19995117
211+
objectReference: {fileID: 0}
212+
- target: {fileID: 22477518, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
213+
propertyPath: m_AnchoredPosition.x
214+
value: -0.19995117
215+
objectReference: {fileID: 0}
216+
- target: {fileID: 22424132, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
217+
propertyPath: m_AnchoredPosition.x
218+
value: -0.19995117
219+
objectReference: {fileID: 0}
220+
- target: {fileID: 22460488, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
221+
propertyPath: m_AnchoredPosition.x
222+
value: -0.19995117
223+
objectReference: {fileID: 0}
224+
- target: {fileID: 22450346, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
225+
propertyPath: m_AnchoredPosition.x
226+
value: -0.19995117
227+
objectReference: {fileID: 0}
228+
m_RemovedComponents: []
229+
m_SourcePrefab: {fileID: 100100000, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3}
230+
--- !u!224 &6469922353199246102 stripped
231+
RectTransform:
232+
m_CorrespondingSourceObject: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3,
233+
type: 3}
234+
m_PrefabInstance: {fileID: 6469922353212718786}
235+
m_PrefabAsset: {fileID: 0}

‎Assets/Game/Scripts/Base/GameMode.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,20 @@ IEnumerator Start()
112112
WebRequest.SetWebDownloadHelper(webDownloadHelper.AddComponent<WebDownloadMonoHelper>());
113113
#endregion
114114

115+
#region Setting
116+
GameObject debugHelper = transform.Find("[Graphy]").gameObject;
117+
Setting.SetDebuger(debugHelper);
118+
Setting.DebugEnable = DebugEnable;
119+
#endregion
120+
115121
#region state
116122
//开启整个项目的流程
117123
Assembly = typeof(GameMode).Assembly;
118124
State.CreateContext(Assembly);
119125
yield return new WaitForEndOfFrame();
120126
State.SetStateStart();
121127
#endregion
122-
123-
#region Setting
124-
GameObject debugHelper = new GameObject("DebugHelper");
125-
debugHelper.transform.SetParent(transform);
126-
Setting.SetDebugHelper(debugHelper.AddComponent<DebugHelper>());
127-
Setting.DebugEnable = DebugEnable;
128-
#endregion
128+
129129
}
130130

131131
private void Update()

‎Assets/Game/Scripts/State/CheckResourceState.cs

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ public override void OnEnter(params object[] parameters)
6060
GameMode.Event.AddListener<DownloadProgressEventArgs>(OnDownloadProgress);
6161

6262
_localVersion=LoadLocalVersion();
63+
64+
//从StreamingAsset复制到读写路径下
65+
if (_localVersion == null)
66+
{
67+
MoveFiles(Application.streamingAssetsPath, Application.persistentDataPath);
68+
_localVersion = LoadLocalVersion();
69+
}
70+
6371
LoadRemoteVersion();
6472
}
6573

@@ -256,7 +264,34 @@ private string GetPlatformName()
256264
#endif
257265
return platformName.ToLower();
258266
}
259-
#endregion
267+
268+
//获取文件
269+
private string[] GetFiles(string path)
270+
{
271+
List<string> files = new List<string>();
272+
files.AddRange(Directory.GetFiles(path));
273+
foreach (var item in Directory.GetDirectories(path))
274+
{
275+
files.AddRange(GetFiles(item));
276+
}
277+
return files.ToArray();
278+
}
279+
280+
//移动物体
281+
private void MoveFiles(string srcPath, string dstPath)
282+
{
283+
string[] files = GetFiles(srcPath);
284+
foreach (var item in files)
285+
{
286+
string targetPath = item.Replace(srcPath, dstPath);
287+
string dirPath = Path.GetDirectoryName(targetPath);
288+
if (!Directory.Exists(dirPath))
289+
Directory.CreateDirectory(dirPath);
290+
File.Copy(item, targetPath, true);
291+
}
292+
}
293+
294+
#endregion
260295

261296
}
262297
}

‎Assets/GameFramework/Editor/AssetBundleEditor/AssetBundleBuildEditor.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public class AssetBundleBuildEditor :EditorWindow {
2828
[MenuItem("Tools/AssetBundles Options %#O")]
2929
public static void AssetBundilesOptions()
3030
{
31-
_rootPath=Path.GetDirectoryName(Application.dataPath);
31+
_rootPath = Path.GetDirectoryName(Path.GetFullPath(Application.dataPath));
3232

33-
LoadConfig();
33+
LoadConfig();
3434

35-
BuildTarget[] allTargets= (BuildTarget[])Enum.GetValues(typeof(BuildTarget));
36-
//_allTargets
37-
foreach (var item in allTargets)
35+
BuildTarget[] allTargets = (BuildTarget[])Enum.GetValues(typeof(BuildTarget));
36+
//_allTargets
37+
foreach (var item in allTargets)
3838
{
3939
int index=(int)item;
4040
if(_config.BuildTargets.Contains(index))
@@ -115,9 +115,10 @@ void OnGUI()
115115
path=EditorUtility.OpenFolderPanel("Build Path",path,"");
116116
if(!string.IsNullOrEmpty(path))
117117
{
118-
if(path.Contains(_rootPath))
119-
{
120-
path=path.Replace(_rootPath,"");
118+
path = Path.GetFullPath(path);
119+
if (path.Contains(_rootPath))
120+
{
121+
path = path.Replace(_rootPath, "").Replace("\\", "/");
121122
if(path.IndexOf("/")==0)
122123
{
123124
path= path.Substring(1,path.Length-1);

0 commit comments

Comments
 (0)