Skip to content

Commit 1079fb8

Browse files
Update package to 2.1.0
1 parent 5b87a33 commit 1079fb8

File tree

7 files changed

+354
-28
lines changed

7 files changed

+354
-28
lines changed

Package/GameManager/Runtime/Demo/GameManagerSample.unity

Lines changed: 276 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,140 @@ NavMeshSettings:
123123
debug:
124124
m_Flags: 0
125125
m_NavMeshData: {fileID: 0}
126+
--- !u!1 &62341404
127+
GameObject:
128+
m_ObjectHideFlags: 0
129+
m_CorrespondingSourceObject: {fileID: 0}
130+
m_PrefabInstance: {fileID: 0}
131+
m_PrefabAsset: {fileID: 0}
132+
serializedVersion: 6
133+
m_Component:
134+
- component: {fileID: 62341405}
135+
- component: {fileID: 62341407}
136+
- component: {fileID: 62341406}
137+
m_Layer: 5
138+
m_Name: Text (TMP)
139+
m_TagString: Untagged
140+
m_Icon: {fileID: 0}
141+
m_NavMeshLayer: 0
142+
m_StaticEditorFlags: 0
143+
m_IsActive: 1
144+
--- !u!224 &62341405
145+
RectTransform:
146+
m_ObjectHideFlags: 0
147+
m_CorrespondingSourceObject: {fileID: 0}
148+
m_PrefabInstance: {fileID: 0}
149+
m_PrefabAsset: {fileID: 0}
150+
m_GameObject: {fileID: 62341404}
151+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
152+
m_LocalPosition: {x: 0, y: 0, z: 0}
153+
m_LocalScale: {x: 1, y: 1, z: 1}
154+
m_Children: []
155+
m_Father: {fileID: 396977485}
156+
m_RootOrder: 0
157+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
158+
m_AnchorMin: {x: 0, y: 0}
159+
m_AnchorMax: {x: 1, y: 1}
160+
m_AnchoredPosition: {x: 0, y: 0}
161+
m_SizeDelta: {x: 0, y: 0}
162+
m_Pivot: {x: 0.5, y: 0.5}
163+
--- !u!114 &62341406
164+
MonoBehaviour:
165+
m_ObjectHideFlags: 0
166+
m_CorrespondingSourceObject: {fileID: 0}
167+
m_PrefabInstance: {fileID: 0}
168+
m_PrefabAsset: {fileID: 0}
169+
m_GameObject: {fileID: 62341404}
170+
m_Enabled: 1
171+
m_EditorHideFlags: 0
172+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
173+
m_Name:
174+
m_EditorClassIdentifier:
175+
m_Material: {fileID: 0}
176+
m_Color: {r: 1, g: 1, b: 1, a: 1}
177+
m_RaycastTarget: 1
178+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
179+
m_Maskable: 1
180+
m_OnCullStateChanged:
181+
m_PersistentCalls:
182+
m_Calls: []
183+
m_text: Lose(L)
184+
m_isRightToLeft: 0
185+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
186+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
187+
m_fontSharedMaterials: []
188+
m_fontMaterial: {fileID: 0}
189+
m_fontMaterials: []
190+
m_fontColor32:
191+
serializedVersion: 2
192+
rgba: 4281479730
193+
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
194+
m_enableVertexGradient: 0
195+
m_colorMode: 3
196+
m_fontColorGradient:
197+
topLeft: {r: 1, g: 1, b: 1, a: 1}
198+
topRight: {r: 1, g: 1, b: 1, a: 1}
199+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
200+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
201+
m_fontColorGradientPreset: {fileID: 0}
202+
m_spriteAsset: {fileID: 0}
203+
m_tintAllSprites: 0
204+
m_StyleSheet: {fileID: 0}
205+
m_TextStyleHashCode: -1183493901
206+
m_overrideHtmlColors: 0
207+
m_faceColor:
208+
serializedVersion: 2
209+
rgba: 4294967295
210+
m_fontSize: 50
211+
m_fontSizeBase: 24
212+
m_fontWeight: 400
213+
m_enableAutoSizing: 1
214+
m_fontSizeMin: 2.3
215+
m_fontSizeMax: 50
216+
m_fontStyle: 0
217+
m_HorizontalAlignment: 2
218+
m_VerticalAlignment: 512
219+
m_textAlignment: 65535
220+
m_characterSpacing: 0
221+
m_wordSpacing: 0
222+
m_lineSpacing: 0
223+
m_lineSpacingMax: 0
224+
m_paragraphSpacing: 0
225+
m_charWidthMaxAdj: 0
226+
m_enableWordWrapping: 0
227+
m_wordWrappingRatios: 0.4
228+
m_overflowMode: 0
229+
m_linkedTextComponent: {fileID: 0}
230+
parentLinkedComponent: {fileID: 0}
231+
m_enableKerning: 0
232+
m_enableExtraPadding: 0
233+
checkPaddingRequired: 0
234+
m_isRichText: 1
235+
m_parseCtrlCharacters: 1
236+
m_isOrthographic: 1
237+
m_isCullingEnabled: 0
238+
m_horizontalMapping: 0
239+
m_verticalMapping: 0
240+
m_uvLineOffset: 0
241+
m_geometrySortingOrder: 0
242+
m_IsTextObjectScaleStatic: 0
243+
m_VertexBufferAutoSizeReduction: 0
244+
m_useMaxVisibleDescender: 1
245+
m_pageToDisplay: 1
246+
m_margin: {x: 0, y: 0, z: 0, w: 0}
247+
m_isUsingLegacyAnimationComponent: 0
248+
m_isVolumetricText: 0
249+
m_hasFontAssetChanged: 0
250+
m_baseMaterial: {fileID: 0}
251+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
252+
--- !u!222 &62341407
253+
CanvasRenderer:
254+
m_ObjectHideFlags: 0
255+
m_CorrespondingSourceObject: {fileID: 0}
256+
m_PrefabInstance: {fileID: 0}
257+
m_PrefabAsset: {fileID: 0}
258+
m_GameObject: {fileID: 62341404}
259+
m_CullTransparentMesh: 1
126260
--- !u!1 &335923504
127261
GameObject:
128262
m_ObjectHideFlags: 0
@@ -155,6 +289,7 @@ RectTransform:
155289
- {fileID: 606721068}
156290
- {fileID: 742890981}
157291
- {fileID: 434160729}
292+
- {fileID: 396977485}
158293
- {fileID: 1214366928}
159294
m_Father: {fileID: 520460761}
160295
m_RootOrder: 1
@@ -335,6 +470,139 @@ CanvasRenderer:
335470
m_PrefabAsset: {fileID: 0}
336471
m_GameObject: {fileID: 396088478}
337472
m_CullTransparentMesh: 1
473+
--- !u!1 &396977484
474+
GameObject:
475+
m_ObjectHideFlags: 0
476+
m_CorrespondingSourceObject: {fileID: 0}
477+
m_PrefabInstance: {fileID: 0}
478+
m_PrefabAsset: {fileID: 0}
479+
serializedVersion: 6
480+
m_Component:
481+
- component: {fileID: 396977485}
482+
- component: {fileID: 396977488}
483+
- component: {fileID: 396977487}
484+
- component: {fileID: 396977486}
485+
m_Layer: 5
486+
m_Name: Button (4)
487+
m_TagString: Untagged
488+
m_Icon: {fileID: 0}
489+
m_NavMeshLayer: 0
490+
m_StaticEditorFlags: 0
491+
m_IsActive: 1
492+
--- !u!224 &396977485
493+
RectTransform:
494+
m_ObjectHideFlags: 0
495+
m_CorrespondingSourceObject: {fileID: 0}
496+
m_PrefabInstance: {fileID: 0}
497+
m_PrefabAsset: {fileID: 0}
498+
m_GameObject: {fileID: 396977484}
499+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
500+
m_LocalPosition: {x: 0, y: 0, z: 0}
501+
m_LocalScale: {x: 1, y: 1, z: 1}
502+
m_Children:
503+
- {fileID: 62341405}
504+
m_Father: {fileID: 335923505}
505+
m_RootOrder: 4
506+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
507+
m_AnchorMin: {x: 0, y: 0}
508+
m_AnchorMax: {x: 0, y: 0}
509+
m_AnchoredPosition: {x: 0, y: 0}
510+
m_SizeDelta: {x: 180, y: 185.2}
511+
m_Pivot: {x: 0.5, y: 0.5}
512+
--- !u!114 &396977486
513+
MonoBehaviour:
514+
m_ObjectHideFlags: 0
515+
m_CorrespondingSourceObject: {fileID: 0}
516+
m_PrefabInstance: {fileID: 0}
517+
m_PrefabAsset: {fileID: 0}
518+
m_GameObject: {fileID: 396977484}
519+
m_Enabled: 1
520+
m_EditorHideFlags: 0
521+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
522+
m_Name:
523+
m_EditorClassIdentifier:
524+
m_Navigation:
525+
m_Mode: 3
526+
m_WrapAround: 0
527+
m_SelectOnUp: {fileID: 0}
528+
m_SelectOnDown: {fileID: 0}
529+
m_SelectOnLeft: {fileID: 0}
530+
m_SelectOnRight: {fileID: 0}
531+
m_Transition: 1
532+
m_Colors:
533+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
534+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
535+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
536+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
537+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
538+
m_ColorMultiplier: 1
539+
m_FadeDuration: 0.1
540+
m_SpriteState:
541+
m_HighlightedSprite: {fileID: 0}
542+
m_PressedSprite: {fileID: 0}
543+
m_SelectedSprite: {fileID: 0}
544+
m_DisabledSprite: {fileID: 0}
545+
m_AnimationTriggers:
546+
m_NormalTrigger: Normal
547+
m_HighlightedTrigger: Highlighted
548+
m_PressedTrigger: Pressed
549+
m_SelectedTrigger: Selected
550+
m_DisabledTrigger: Disabled
551+
m_Interactable: 1
552+
m_TargetGraphic: {fileID: 396977487}
553+
m_OnClick:
554+
m_PersistentCalls:
555+
m_Calls:
556+
- m_Target: {fileID: 347371482}
557+
m_TargetAssemblyTypeName: Joyixir.GameManager.GameManager, Assembly-CSharp
558+
m_MethodName: ForceLose
559+
m_Mode: 1
560+
m_Arguments:
561+
m_ObjectArgument: {fileID: 0}
562+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
563+
m_IntArgument: 0
564+
m_FloatArgument: 0
565+
m_StringArgument:
566+
m_BoolArgument: 0
567+
m_CallState: 1
568+
--- !u!114 &396977487
569+
MonoBehaviour:
570+
m_ObjectHideFlags: 0
571+
m_CorrespondingSourceObject: {fileID: 0}
572+
m_PrefabInstance: {fileID: 0}
573+
m_PrefabAsset: {fileID: 0}
574+
m_GameObject: {fileID: 396977484}
575+
m_Enabled: 1
576+
m_EditorHideFlags: 0
577+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
578+
m_Name:
579+
m_EditorClassIdentifier:
580+
m_Material: {fileID: 0}
581+
m_Color: {r: 1, g: 1, b: 1, a: 1}
582+
m_RaycastTarget: 1
583+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
584+
m_Maskable: 1
585+
m_OnCullStateChanged:
586+
m_PersistentCalls:
587+
m_Calls: []
588+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
589+
m_Type: 1
590+
m_PreserveAspect: 0
591+
m_FillCenter: 1
592+
m_FillMethod: 4
593+
m_FillAmount: 1
594+
m_FillClockwise: 1
595+
m_FillOrigin: 0
596+
m_UseSpriteMesh: 0
597+
m_PixelsPerUnitMultiplier: 1
598+
--- !u!222 &396977488
599+
CanvasRenderer:
600+
m_ObjectHideFlags: 0
601+
m_CorrespondingSourceObject: {fileID: 0}
602+
m_PrefabInstance: {fileID: 0}
603+
m_PrefabAsset: {fileID: 0}
604+
m_GameObject: {fileID: 396977484}
605+
m_CullTransparentMesh: 1
338606
--- !u!1 &434160728
339607
GameObject:
340608
m_ObjectHideFlags: 0
@@ -372,7 +640,7 @@ RectTransform:
372640
m_AnchorMin: {x: 0, y: 0}
373641
m_AnchorMax: {x: 0, y: 0}
374642
m_AnchoredPosition: {x: 0, y: 0}
375-
m_SizeDelta: {x: 216, y: 185.2}
643+
m_SizeDelta: {x: 180, y: 185.2}
376644
m_Pivot: {x: 0.5, y: 0.5}
377645
--- !u!114 &434160730
378646
MonoBehaviour:
@@ -606,7 +874,7 @@ RectTransform:
606874
m_AnchorMin: {x: 0, y: 0}
607875
m_AnchorMax: {x: 0, y: 0}
608876
m_AnchoredPosition: {x: 0, y: 0}
609-
m_SizeDelta: {x: 216, y: 185.2}
877+
m_SizeDelta: {x: 180, y: 185.2}
610878
m_Pivot: {x: 0.5, y: 0.5}
611879
--- !u!114 &606721069
612880
MonoBehaviour:
@@ -980,7 +1248,7 @@ RectTransform:
9801248
m_AnchorMin: {x: 0, y: 0}
9811249
m_AnchorMax: {x: 0, y: 0}
9821250
m_AnchoredPosition: {x: 0, y: 0}
983-
m_SizeDelta: {x: 216, y: 185.2}
1251+
m_SizeDelta: {x: 180, y: 185.2}
9841252
m_Pivot: {x: 0.5, y: 0.5}
9851253
--- !u!114 &742890982
9861254
MonoBehaviour:
@@ -1325,12 +1593,12 @@ RectTransform:
13251593
m_Children:
13261594
- {fileID: 2012487675}
13271595
m_Father: {fileID: 335923505}
1328-
m_RootOrder: 4
1596+
m_RootOrder: 5
13291597
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13301598
m_AnchorMin: {x: 0, y: 0}
13311599
m_AnchorMax: {x: 0, y: 0}
13321600
m_AnchoredPosition: {x: 0, y: 0}
1333-
m_SizeDelta: {x: 216, y: 185.2}
1601+
m_SizeDelta: {x: 180, y: 185.2}
13341602
m_Pivot: {x: 0.5, y: 0.5}
13351603
--- !u!114 &1214366929
13361604
MonoBehaviour:
@@ -1510,7 +1778,7 @@ MonoBehaviour:
15101778
m_faceColor:
15111779
serializedVersion: 2
15121780
rgba: 4294967295
1513-
m_fontSize: 50
1781+
m_fontSize: 47.75
15141782
m_fontSizeBase: 24
15151783
m_fontWeight: 400
15161784
m_enableAutoSizing: 1
@@ -1731,7 +1999,7 @@ RectTransform:
17311999
m_AnchorMin: {x: 0, y: 0}
17322000
m_AnchorMax: {x: 0, y: 0}
17332001
m_AnchoredPosition: {x: 0, y: 0}
1734-
m_SizeDelta: {x: 216, y: 185.2}
2002+
m_SizeDelta: {x: 180, y: 185.2}
17352003
m_Pivot: {x: 0.5, y: 0.5}
17362004
--- !u!114 &1642329956
17372005
MonoBehaviour:
@@ -2058,7 +2326,7 @@ MonoBehaviour:
20582326
m_faceColor:
20592327
serializedVersion: 2
20602328
rgba: 4294967295
2061-
m_fontSize: 50
2329+
m_fontSize: 45.35
20622330
m_fontSizeBase: 24
20632331
m_fontWeight: 400
20642332
m_enableAutoSizing: 1

Package/GameManager/Runtime/Demo/Resources/GameManagerDemoLevel1.asset.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.

Package/GameManager/Runtime/Demo/Resources/GameManagerDemoLevel2.asset.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.

Package/GameManager/Runtime/Scripts/GameManager.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ private void Update()
3737
StartLevel();
3838
if (UnityEngine.Input.GetKeyDown(KeyCode.W))
3939
ForceWin();
40+
if (UnityEngine.Input.GetKeyDown(KeyCode.L))
41+
ForceLose();
4042
if (UnityEngine.Input.GetKeyDown(KeyCode.R))
4143
Retry();
4244
if (UnityEngine.Input.GetKeyDown(KeyCode.RightArrow))
@@ -102,6 +104,11 @@ public static void ForceWin()
102104
LevelManager.Instance.ForceWin();
103105
}
104106

107+
public static void ForceLose()
108+
{
109+
LevelManager.Instance.ForceLose();
110+
}
111+
105112
public static void ForceFinish()
106113
{
107114
LevelManager.Instance.ForceFinish();

0 commit comments

Comments
 (0)