diff --git a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn index ff3fdaf0e..d33bd8d0f 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn @@ -574,7 +574,7 @@ me: 那我们试试吧…在视觉模块验证一下吧。 title: 流程结束 tags: colorID: 8 -position: 227,1260 +position: 226,1192 --- <> me: 我们出去聊吧 @@ -590,12 +590,48 @@ me: 我们出去聊吧 -> 尽快回来 -> 注意安全 -> 跑的越远越好 - 第二天结束 + <> + <> - BE结局 - ->游戏结束 + <> <> === +title: 第二天结束 +tags: +colorID: 8 +position: 20,1480 +--- +<> +佩佩没有回来 +对此,你并不是完全没有预料 +对于热爱色彩的她来说,重新获得用自己眼睛看世界的机会 +是无法克制不去吮吸的 +但是佩佩能就这样一走了之么? +【佩佩未完待续】 +<> +=== +title: 游戏结束 +tags: +colorID: 8 +position: 447,1476 +--- +<> +自此之后你再没有见过佩佩 +你没有在回收名单上见到她,但是总觉得,好像什么东西已经消失了 +【佩佩Bad Ending】 +<> +=== +title: 后话 +tags: +colorID: 6 +position: 260,1868 +--- +感谢游玩《艾比斯之梦》的早期demo +为当前demo中对您造成困惑的设计,bug等等不佳体验抱歉 +欢迎微信联系:15209116298 或QQ群325268983进行反馈 +非常感谢 +=== + title: OnMemoryViewShow tags: colorID: 6 @@ -613,6 +649,7 @@ me: 这里没什么可看的 + title: IntoEyeView tags: colorID: 6 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index a17be2d5b..16b342a2e 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1676,7 +1676,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: localNodes.Array.size - value: 8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: localNodes.Array.data[0] @@ -2102,14 +2102,102 @@ PrefabInstance: propertyPath: nodeLists.Array.data[27] value: objectReference: {fileID: 1736368753} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.size + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.size + value: 19 + objectReference: {fileID: 0} - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: Day1InitnodeLists.Array.size - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: Day2InitnodeLists.Array.size value: 10 objectReference: {fileID: 0} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[0] + value: + objectReference: {fileID: 1844301390} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[1] + value: + objectReference: {fileID: 1282326177} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[2] + value: + objectReference: {fileID: 679539979} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[3] + value: + objectReference: {fileID: 1392825347} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[4] + value: + objectReference: {fileID: 38676759} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[5] + value: + objectReference: {fileID: 798685759} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[6] + value: + objectReference: {fileID: 2001435038} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[7] + value: + objectReference: {fileID: 2143542799} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[8] + value: + objectReference: {fileID: 5110036007419992350} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day1AllnodeLists.Array.data[9] + value: + objectReference: {fileID: 1204800887} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[0] + value: + objectReference: {fileID: 907604965} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[1] + value: + objectReference: {fileID: 525661795} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[2] + value: + objectReference: {fileID: 1736368753} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[3] + value: + objectReference: {fileID: 1252273067} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[4] + value: + objectReference: {fileID: 452616766} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[5] + value: + objectReference: {fileID: 1744244023} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[6] + value: + objectReference: {fileID: 473012968} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[7] + value: + objectReference: {fileID: 152371304} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[8] + value: + objectReference: {fileID: 1327744180} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[9] + value: + objectReference: {fileID: 453831057} - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: Day1InitnodeLists.Array.data[0] value: @@ -2145,11 +2233,47 @@ PrefabInstance: - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: Day1InitnodeLists.Array.data[8] value: - objectReference: {fileID: 38676759} + objectReference: {fileID: 1204800887} - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: Day1InitnodeLists.Array.data[9] value: objectReference: {fileID: 2001435038} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[10] + value: + objectReference: {fileID: 72897810} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[11] + value: + objectReference: {fileID: 104184431} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[12] + value: + objectReference: {fileID: 2021089450} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[13] + value: + objectReference: {fileID: 1733277639} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[14] + value: + objectReference: {fileID: 1821838747} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[15] + value: + objectReference: {fileID: 1296366325} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[16] + value: + objectReference: {fileID: 1573934238} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[17] + value: + objectReference: {fileID: 1525243926} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: Day2AllnodeLists.Array.data[18] + value: + objectReference: {fileID: 512822523} - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: Day2InitnodeLists.Array.data[0] value: diff --git a/Assets/Scripts/Clue/ClueBaordNew.cs b/Assets/Scripts/Clue/ClueBaordNew.cs index f97589ab9..dac07524f 100644 --- a/Assets/Scripts/Clue/ClueBaordNew.cs +++ b/Assets/Scripts/Clue/ClueBaordNew.cs @@ -18,6 +18,10 @@ public class ClueBaordNew : MonoBehaviour public List Day2InitnodeLists; + public List Day1AllnodeLists; + + public List Day2AllnodeLists; + public Notification ClueBoardNotification; //private Dictionary nodePositions = new Dictionary(); @@ -48,10 +52,10 @@ public class ClueBaordNew : MonoBehaviour if(day==1) { - // foreach(Node node in Day2InitnodeLists) - // { - // node.gameObject.SetActive(false); - // } + foreach(Node node in Day2AllnodeLists) + { + node.gameObject.SetActive(false); + } foreach(Node node in Day1InitnodeLists) { node.gameObject.SetActive(true); @@ -62,11 +66,11 @@ public class ClueBaordNew : MonoBehaviour } if(day==2) { - // gm.localConnections.Clear(); - // foreach(Node node in Day1InitnodeLists) - // { - // node.gameObject.SetActive(false); - // } + gm.localConnections.Clear(); + foreach(Node node in Day1AllnodeLists) + { + node.gameObject.SetActive(false); + } foreach(Node node in Day2InitnodeLists) { node.gameObject.SetActive(true); @@ -75,7 +79,7 @@ public class ClueBaordNew : MonoBehaviour } } - public Node GetNode(string nodeID) + public Node GetNode(string nodeID) { return gm.localNodes.Find(node => node.ID == nodeID); } diff --git a/ProjectSettings/ScriptableBuildPipeline.json b/ProjectSettings/ScriptableBuildPipeline.json new file mode 100644 index 000000000..e6738dc22 --- /dev/null +++ b/ProjectSettings/ScriptableBuildPipeline.json @@ -0,0 +1,13 @@ +{ + "useBuildCacheServer": false, + "cacheServerHost": "", + "cacheServerPort": 8126, + "threadedArchiving": true, + "logCacheMiss": false, + "slimWriteResults": true, + "maximumCacheSize": 20, + "useDetailedBuildLog": false, + "useV2Hasher": true, + "fileIDHashSeed": 0, + "prefabPackedHeaderSize": 2 +} \ No newline at end of file