福星高照 提交

dev_chengFeng
jiaoyangna 2021-05-25 10:07:31 +08:00
parent 40fcabaf55
commit c9c5480484
6 changed files with 111 additions and 21 deletions

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 22073f83497e11448a02cfa30f588190
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: d007d7a9d9e962e458695173c7cbb86d
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 6b8a26dd8129bc84da65a093413125bb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: edf73062a0b7a3c4eba2030ab5f8e75f
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5306,7 +5306,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 63} m_AnchoredPosition: {x: -0.00000020862, y: 80}
m_SizeDelta: {x: 1080, y: 1920} m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4620770588226768647 --- !u!222 &4620770588226768647
@ -15202,7 +15202,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -825} m_AnchoredPosition: {x: 0, y: -629}
m_SizeDelta: {x: 160, y: 100} m_SizeDelta: {x: 160, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5609358027440368271 --- !u!222 &5609358027440368271
@ -20331,8 +20331,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0.14447, y: -795}
m_SizeDelta: {x: 1032, y: 1513} m_SizeDelta: {x: 1080, y: 330}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6562702879592835339 --- !u!222 &6562702879592835339
CanvasRenderer: CanvasRenderer:
@ -20362,7 +20362,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 6589d49a6d560754c8630163c9f5d018, type: 3} m_Sprite: {fileID: 21300000, guid: ec57da0f47b6f5543838e74d07f7a738, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -25237,14 +25237,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0} m_Sprite: {fileID: 21300000, guid: 09a450be982595f409c7128c923b6efc, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -25395,7 +25395,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -55.752563, y: -648} m_AnchoredPosition: {x: -55.752563, y: -659}
m_SizeDelta: {x: 359, y: 139} m_SizeDelta: {x: 359, y: 139}
m_Pivot: {x: 0.34429798, y: 1.0000001} m_Pivot: {x: 0.34429798, y: 1.0000001}
--- !u!222 &2448417778657596675 --- !u!222 &2448417778657596675
@ -35697,7 +35697,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -5, y: -312} m_AnchoredPosition: {x: -9, y: -246}
m_SizeDelta: {x: 612, y: 210} m_SizeDelta: {x: 612, y: 210}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4609286631420479438 --- !u!222 &4609286631420479438
@ -35776,7 +35776,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -13} m_AnchoredPosition: {x: 0, y: -35}
m_SizeDelta: {x: 980, y: 368} m_SizeDelta: {x: 980, y: 368}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5768294439603233441 --- !u!222 &5768294439603233441
@ -35975,7 +35975,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -334} m_AnchoredPosition: {x: 0, y: -339}
m_SizeDelta: {x: 922, y: 640} m_SizeDelta: {x: 922, y: 640}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1697103852556535286 --- !u!114 &1697103852556535286
@ -36227,7 +36227,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.2568359, y: -89} m_AnchoredPosition: {x: 0.14447, y: -97}
m_SizeDelta: {x: 293, y: 63} m_SizeDelta: {x: 293, y: 63}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2713194774263229033 --- !u!222 &2713194774263229033
@ -36375,7 +36375,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -69, y: 266} m_AnchoredPosition: {x: -69, y: 222}
m_SizeDelta: {x: 732, y: 651} m_SizeDelta: {x: 732, y: 651}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064629863237319123 --- !u!222 &6064629863237319123
@ -41499,7 +41499,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -15, y: 95} m_AnchoredPosition: {x: -15.5, y: 136}
m_SizeDelta: {x: 949, y: 153} m_SizeDelta: {x: 949, y: 153}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4304417546296333261 --- !u!222 &4304417546296333261

View File

@ -3,19 +3,16 @@ local this = StoryMapManager
this.groupConfigs = {} this.groupConfigs = {}
this.isShowStory = 0 this.isShowStory = 0
local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig) local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig)
local groupId
--初始化 --初始化
function this.Initialize() function this.Initialize()
end end
function this.InitData(groupId) function this.InitData(_groupId)
if groupId == 1 then groupId = _groupId
SoundManager.PlayMusic(SoundConfig.BGM_STORY_1_1)
elseif groupId == 3 then
SoundManager.PlayMusic(SoundConfig.BGM_STORY_2_1)
end
this.groupConfigs = {} this.groupConfigs = {}
this.InitGroupIds(groupId) this.InitGroupIds(_groupId)
this.GetSingleStoryConfig() this.GetSingleStoryConfig()
end end
@ -34,6 +31,11 @@ function this.GetSingleStoryConfig()
if UIManager.IsOpen(UIName.StoryMapPanel) then if UIManager.IsOpen(UIName.StoryMapPanel) then
UIManager.ClosePanel(UIName.StoryMapPanel) UIManager.ClosePanel(UIName.StoryMapPanel)
end end
if groupId == 1 then
SoundManager.PlayMusic(SoundConfig.BGM_STORY_1_1)
elseif groupId == 3 then
SoundManager.PlayMusic(SoundConfig.BGM_STORY_2_1)
end
UIManager.OpenPanel(UIName.StoryMapPanel,config) UIManager.OpenPanel(UIName.StoryMapPanel,config)
table.remove(this.groupConfigs,1) table.remove(this.groupConfigs,1)
else else