【建造】第二个场景
parent
3d9a913e75
commit
b5f45b66e5
Binary file not shown.
After Width: | Height: | Size: 57 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 50a04592501344405948b77d73a61b91
|
||||
guid: 1f887ec0c6df64a739c25b6345066ece
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
Binary file not shown.
Before Width: | Height: | Size: 579 KiB |
Binary file not shown.
Before Width: | Height: | Size: 585 KiB |
|
@ -1,153 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d5c87d6905cca4400ad7e2576a7bc679
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -330,7 +330,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5673611186938740740}
|
||||
- {fileID: 9070231653115089452}
|
||||
- {fileID: 3804144736829025951}
|
||||
m_Father: {fileID: 891812303934638700}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
|
@ -977,7 +977,7 @@ MonoBehaviour:
|
|||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &6505346509841720526
|
||||
--- !u!1 &6451036025001922235
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -985,24 +985,24 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9070231653115089452}
|
||||
- component: {fileID: 422285671132266997}
|
||||
- component: {fileID: 2248377038606142073}
|
||||
- component: {fileID: 8389258773275937078}
|
||||
- component: {fileID: 3804144736829025951}
|
||||
- component: {fileID: 5498687984877127090}
|
||||
- component: {fileID: 3000255734937544268}
|
||||
- component: {fileID: 5954421308858034066}
|
||||
m_Layer: 5
|
||||
m_Name: Btn_Level
|
||||
m_Name: Btn_Change
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9070231653115089452
|
||||
--- !u!224 &3804144736829025951
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6505346509841720526}
|
||||
m_GameObject: {fileID: 6451036025001922235}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
|
@ -1015,21 +1015,21 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 40, y: 50}
|
||||
m_SizeDelta: {x: 183.33, y: 200}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &422285671132266997
|
||||
--- !u!222 &5498687984877127090
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6505346509841720526}
|
||||
m_GameObject: {fileID: 6451036025001922235}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2248377038606142073
|
||||
--- !u!114 &3000255734937544268
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6505346509841720526}
|
||||
m_GameObject: {fileID: 6451036025001922235}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
|
@ -1043,7 +1043,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 7f0f00ceb6ba24be7bf9d9d7b8d33e64, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 1f887ec0c6df64a739c25b6345066ece, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -1053,13 +1053,13 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &8389258773275937078
|
||||
--- !u!114 &5954421308858034066
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6505346509841720526}
|
||||
m_GameObject: {fileID: 6451036025001922235}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
|
@ -1093,7 +1093,7 @@ MonoBehaviour:
|
|||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 2248377038606142073}
|
||||
m_TargetGraphic: {fileID: 3000255734937544268}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
@ -1372,6 +1372,7 @@ RectTransform:
|
|||
- {fileID: 2932034157699266402}
|
||||
- {fileID: 6537855527602855844}
|
||||
- {fileID: 6180863349140604280}
|
||||
- {fileID: 1087604700062822817}
|
||||
m_Father: {fileID: 8857395475620571252}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
|
@ -1417,6 +1418,126 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &9119613848228781874
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1087604700062822817}
|
||||
- component: {fileID: 6828308066492797863}
|
||||
- component: {fileID: 3964102523485133}
|
||||
- component: {fileID: 5509608241295875139}
|
||||
m_Layer: 5
|
||||
m_Name: Btn_Level
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1087604700062822817
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9119613848228781874}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1683202030608543866}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -14, y: -727}
|
||||
m_SizeDelta: {x: 135, y: 146.4}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &6828308066492797863
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9119613848228781874}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3964102523485133
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9119613848228781874}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 7f0f00ceb6ba24be7bf9d9d7b8d33e64, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &5509608241295875139
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9119613848228781874}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 3964102523485133}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &9129577244723562157
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -24,6 +24,7 @@ namespace Framework.Event
|
|||
ShowGfx,
|
||||
AddTime,
|
||||
LoadingEnd,
|
||||
ChangeBuildScene,
|
||||
|
||||
//关闭展示 建造UI
|
||||
HideBuildUI,
|
||||
|
|
|
@ -55,6 +55,7 @@ namespace Gameplay.LoadingExecutor
|
|||
/// </summary>
|
||||
private async UniTask InitBuildScene()
|
||||
{
|
||||
//读本地存盘
|
||||
var buildInfo = StorageManager.Instance.GetStorage<UserBuildInfo>(NormalConstants.UserBuildSaveKey);
|
||||
buildInfo ??= new UserBuildInfo();
|
||||
if (string.IsNullOrEmpty(buildInfo.BuildData))
|
||||
|
@ -72,6 +73,12 @@ namespace Gameplay.LoadingExecutor
|
|||
}
|
||||
|
||||
var buildId = buildInfo.BuildData;
|
||||
if (BuildManager.Instance.ChangeBuildSceneID)
|
||||
{
|
||||
buildId = buildId.Equals(NormalConstants.DefaultBuildID) ? "Build_2" : NormalConstants.DefaultBuildID;
|
||||
DebugUtil.LogError("更换场景到:{0}",buildId);
|
||||
}
|
||||
|
||||
var buildPath = string.Format(Framework.Constants.PathConstants.SceneBuildPath, buildId);
|
||||
var buildConfig = string.Format(Framework.Constants.PathConstants.BuildConfigPath, buildId);
|
||||
var buildData = await JsonHelper.LoadFromAddressable<BuildData>(buildConfig);
|
||||
|
@ -136,6 +143,7 @@ namespace Gameplay.LoadingExecutor
|
|||
EventManager.Instance.Send(EventManager.EventName.BackToMain);
|
||||
EventManager.Instance.Send(EventManager.EventName.LoadingEnd);
|
||||
BIManager.Instance.TrackEventOnce(EventFirst.fte_loading_end);
|
||||
BuildManager.Instance.ChangeBuildSceneID = false;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -81,7 +81,7 @@ public class GuideMananger : Singlenton<GuideMananger>, IInitable
|
|||
}
|
||||
}
|
||||
|
||||
_curGuideGroup = BuildManager.Instance.BuildSceneInfo.CurGuideGroup;
|
||||
_curGuideGroup = BuildManager.Instance.UserBuildInfo.GuideGroup;
|
||||
if (_curGuideGroup <= 0)
|
||||
{
|
||||
_curGuideGroup = table.DataList[0].GroupID;
|
||||
|
|
|
@ -8,12 +8,14 @@ using Framework.Event;
|
|||
using Gameplay.Manager;
|
||||
using Framework.Manager;
|
||||
using Framework.Constants;
|
||||
using Gameplay.Game;
|
||||
using Event = cfg.BI.Event;
|
||||
|
||||
public class UIStartMainController : UIWindow
|
||||
{
|
||||
private GameObject _mask;
|
||||
private GameObject _blueprint;
|
||||
private string _curBuildSceneID;
|
||||
|
||||
protected override void OnAwake()
|
||||
{
|
||||
|
@ -23,7 +25,8 @@ public class UIStartMainController : UIWindow
|
|||
_mask = FindObj("MaskPanel").gameObject;
|
||||
BindButton("MaskPanel", ShowAllUI);
|
||||
BindButton("UI_LiuHaiBottom/Btn_Game", OnEnterLevel);
|
||||
BindButton("UI_LiuHaiBottom/Btn_Level", OnSelectLevel);
|
||||
BindButton("UI_LiuHaiBottom/Btn_Change", ChangeBuildScene);
|
||||
BindButton("UI_LiuHaiTop/BG_Top/Btn_Level", OnSelectLevel);
|
||||
BindButton("UI_LiuHaiTop/BG_Top/Btn_Setting", OpenSettingPanel);
|
||||
BindButton("UI_LiuHaiTop/BG_Top/Btn_Shop", OpenShop);
|
||||
BindButton("UI_LiuHaiTop/BG_Top/Btn_HideUI", HideAllUI);
|
||||
|
@ -74,6 +77,13 @@ public class UIStartMainController : UIWindow
|
|||
FindObj("UI_LiuHaiTop").SetActive(false);
|
||||
}
|
||||
|
||||
private void ChangeBuildScene()
|
||||
{
|
||||
DebugUtil.LogError("切换场景");
|
||||
BuildManager.Instance.ChangeBuildSceneID = true;
|
||||
GameStateManager.Instance.ChangeState(new GameStateStart());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查看蓝图
|
||||
/// </summary>
|
||||
|
|
|
@ -7,6 +7,7 @@ using Framework.Constants;
|
|||
using Sirenix.OdinInspector;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine.AddressableAssets;
|
||||
|
||||
namespace Framework.Manager
|
||||
{
|
||||
|
@ -165,6 +166,11 @@ namespace Framework.Manager
|
|||
|
||||
public bool IsChanging = false;
|
||||
|
||||
/// <summary>
|
||||
/// 更换场景
|
||||
/// </summary>
|
||||
public bool ChangeBuildSceneID;
|
||||
|
||||
//玩家存盘选择信息
|
||||
private UserBuildInfo _userBuildInfo;
|
||||
|
||||
|
@ -192,14 +198,13 @@ namespace Framework.Manager
|
|||
//Build场景相机
|
||||
public Camera CurBuildCamera;
|
||||
|
||||
|
||||
private BuildData _curBuildData;
|
||||
private bool _isInit;
|
||||
private bool _isInGame;
|
||||
|
||||
public async UniTask Init(BuildData buildData, bool inGame = false, UserBuildInfo userBuildInfo = null)
|
||||
{
|
||||
if (_isInit) return;
|
||||
if (_isInit && !ChangeBuildSceneID) return;
|
||||
_curBuildData = buildData;
|
||||
NodeInfos = new Dictionary<string, NodeInfo>();
|
||||
_iconSprites = new Dictionary<string, Sprite>();
|
||||
|
@ -257,6 +262,7 @@ namespace Framework.Manager
|
|||
{
|
||||
try
|
||||
{
|
||||
if(_isInit)return;
|
||||
//游戏中传入数据
|
||||
if (userBuildInfo != null)
|
||||
{
|
||||
|
@ -409,6 +415,16 @@ namespace Framework.Manager
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更换建造场景
|
||||
/// </summary>
|
||||
public async void ChangeBuildScene()
|
||||
{
|
||||
var buildId = _curBuildData.buildID.Equals(NormalConstants.DefaultBuildID) ? "Build_2" : "Build_1";
|
||||
var buildPath = string.Format(Framework.Constants.PathConstants.SceneBuildPath, buildId);
|
||||
await Addressables.LoadSceneAsync(buildPath).ToUniTask();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获得选项Icon图标
|
||||
/// </summary>
|
||||
|
|
|
@ -316,7 +316,8 @@ public class BuildBoot : MonoBehaviour
|
|||
/// </summary>
|
||||
private void UpdateBuildDisplay()
|
||||
{
|
||||
var chooseNodeInfo = BuildManager.Instance.BuildSceneInfo.GetCurChooseInfo();
|
||||
DebugUtil.LogError("刷新表现");
|
||||
var chooseNodeInfo = BuildManager.Instance.UserBuildInfo.ChooseNodeInfo;
|
||||
if (chooseNodeInfo == null || chooseNodeInfo.Count <= 0)
|
||||
{
|
||||
DebugUtil.LogError("Build Boot: 玩家在该场景的建造信息获取错误");
|
||||
|
@ -679,6 +680,7 @@ public class BuildBoot : MonoBehaviour
|
|||
InputManager.Instance.OnBuildBubbleClick += OnBuildBubbleClick;
|
||||
EventManager.Instance.Register(EventManager.EventName.HideBuildUI, HideUI);
|
||||
EventManager.Instance.Register(EventManager.EventName.ShowBuildUI, ShowUI);
|
||||
EventManager.Instance.Register(EventManager.EventName.ChangeBuildScene, UpdateBuildDisplay);
|
||||
EventManager.Instance.Register(EventManager.EventName.RefreshGameData, UpdateReachCondition);
|
||||
}
|
||||
|
||||
|
@ -692,6 +694,7 @@ public class BuildBoot : MonoBehaviour
|
|||
|
||||
EventManager.Instance.Unregister(EventManager.EventName.HideBuildUI, HideUI);
|
||||
EventManager.Instance.Unregister(EventManager.EventName.ShowBuildUI, ShowUI);
|
||||
EventManager.Instance.Unregister(EventManager.EventName.ChangeBuildScene, UpdateBuildDisplay);
|
||||
EventManager.Instance.Unregister(EventManager.EventName.RefreshGameData, UpdateReachCondition);
|
||||
}
|
||||
}
|
|
@ -1,22 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<projectSettings>
|
||||
<projectSetting name="com.google.external-dependency-managerAnalyticsCookie" value="5537a838bfac415bac89394bdb95521e" />
|
||||
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.AutoPodToolInstallInEditor" value="False" />
|
||||
<projectSetting name="Google.IOSResolver.CocoapodsIntegrationMethod" value="2" />
|
||||
<projectSetting name="Google.IOSResolver.PodfileAddUseFrameworks" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.PodfileAllowPodsInMultipleTargets" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.PodfileAlwaysAddMainTarget" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.PodfileEnabled" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.PodfileStaticLinkFrameworks" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.PodToolExecutionViaShellEnabled" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.PodToolShellExecutionSetLang" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.SwiftFrameworkSupportWorkaroundEnabled" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.SwiftLanguageVersion" value="5.0" />
|
||||
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="GooglePlayServices.AutoResolverEnabled" value="False" />
|
||||
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
|
||||
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
|
||||
</projectSettings>
|
Loading…
Reference in New Issue