详情见最新RomanVersion
Merge Request: 详情见最新RomanVersion Created By: @Roman Accepted By: @Roman URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/87
This commit is contained in:
commit
c8c9c895f8
@ -44,6 +44,6 @@ Material:
|
|||||||
- WaveIntensity_2: 1
|
- WaveIntensity_2: 1
|
||||||
- WaveSpread_Value: 0
|
- WaveSpread_Value: 0
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- Center: {r: -0.05737228, g: 0.29588354, b: 0, a: 0}
|
- Center: {r: 0.20606552, g: 0.31144482, b: 0, a: 0}
|
||||||
- Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0}
|
- Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
@ -214,6 +214,7 @@ GameObject:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 21934456}
|
- component: {fileID: 21934456}
|
||||||
|
- component: {fileID: 21934457}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: "\u5B8C\u6210\u56DE\u5FC6\u540E\u5BF9\u8BDD\u4E4B\u540E"
|
m_Name: "\u5B8C\u6210\u56DE\u5FC6\u540E\u5BF9\u8BDD\u4E4B\u540E"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -235,6 +236,18 @@ Transform:
|
|||||||
m_Father: {fileID: 71136650}
|
m_Father: {fileID: 71136650}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &21934457
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 21934455}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 745a70beba46fbb49bc6403acec3e7f0, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &37275488
|
--- !u!1 &37275488
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1845,6 +1858,7 @@ GameObject:
|
|||||||
- component: {fileID: 775073763}
|
- component: {fileID: 775073763}
|
||||||
- component: {fileID: 775073764}
|
- component: {fileID: 775073764}
|
||||||
- component: {fileID: 775073765}
|
- component: {fileID: 775073765}
|
||||||
|
- component: {fileID: 775073766}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: "\u56DE\u5FC6\u4E4B\u540E\u7684\u5BF9\u8BDD"
|
m_Name: "\u56DE\u5FC6\u4E4B\u540E\u7684\u5BF9\u8BDD"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -1894,6 +1908,7 @@ MonoBehaviour:
|
|||||||
- {fileID: 775073762}
|
- {fileID: 775073762}
|
||||||
- {fileID: 775073764}
|
- {fileID: 775073764}
|
||||||
- {fileID: 775073765}
|
- {fileID: 775073765}
|
||||||
|
- {fileID: 775073766}
|
||||||
suppressAllAutoSelections: 0
|
suppressAllAutoSelections: 0
|
||||||
--- !u!114 &775073761
|
--- !u!114 &775073761
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -1922,7 +1937,7 @@ MonoBehaviour:
|
|||||||
selectedBlocks:
|
selectedBlocks:
|
||||||
- {fileID: 775073760}
|
- {fileID: 775073760}
|
||||||
selectedCommands:
|
selectedCommands:
|
||||||
- {fileID: 775073765}
|
- {fileID: 775073766}
|
||||||
variables: []
|
variables: []
|
||||||
description:
|
description:
|
||||||
stepPause: 0
|
stepPause: 0
|
||||||
@ -2030,6 +2045,23 @@ MonoBehaviour:
|
|||||||
stopVoiceover: 1
|
stopVoiceover: 1
|
||||||
waitForVO: 0
|
waitForVO: 0
|
||||||
setSayDialog: {fileID: 582064879}
|
setSayDialog: {fileID: 582064879}
|
||||||
|
--- !u!114 &775073766
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 775073758}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 17a200dbd67304446a3019434503338a, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
itemId: 4
|
||||||
|
indentLevel: 0
|
||||||
|
targetObject: {fileID: 21934455}
|
||||||
|
methodName: OnCall
|
||||||
|
delay: 0
|
||||||
--- !u!1 &817315566
|
--- !u!1 &817315566
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -3979,7 +4011,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3}
|
m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
selectedFlowchart: {fileID: 866289586}
|
selectedFlowchart: {fileID: 775073761}
|
||||||
--- !u!4 &1463945086
|
--- !u!4 &1463945086
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -4306,7 +4338,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.030000001, y: 0.031479284}
|
m_AnchorMin: {x: 0.030000001, y: 0.031479284}
|
||||||
m_AnchorMax: {x: 0.52917886, y: 0.39900002}
|
m_AnchorMax: {x: 0.52917886, y: 0.39900002}
|
||||||
m_AnchoredPosition: {x: 0.034118652, y: 1.5471497}
|
m_AnchoredPosition: {x: 0.034118652, y: 1.5471802}
|
||||||
m_SizeDelta: {x: -6.344902, y: -5.0294952}
|
m_SizeDelta: {x: -6.344902, y: -5.0294952}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1647231579
|
--- !u!114 &1647231579
|
||||||
@ -4381,7 +4413,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.019539753, y: 0.6984626}
|
m_AnchorMin: {x: 0.019539753, y: 0.6984626}
|
||||||
m_AnchorMax: {x: 0.356, y: 0.93500006}
|
m_AnchorMax: {x: 0.356, y: 0.93500006}
|
||||||
m_AnchoredPosition: {x: 1.2168274, y: 1.6634979}
|
m_AnchoredPosition: {x: 1.2167664, y: 1.6634979}
|
||||||
m_SizeDelta: {x: -9.605, y: -15.7174}
|
m_SizeDelta: {x: -9.605, y: -15.7174}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1682759845
|
--- !u!114 &1682759845
|
||||||
@ -4463,7 +4495,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.52917886, y: 0.031479284}
|
m_AnchorMin: {x: 0.52917886, y: 0.031479284}
|
||||||
m_AnchorMax: {x: 0.99000007, y: 0.39900002}
|
m_AnchorMax: {x: 0.99000007, y: 0.39900002}
|
||||||
m_AnchoredPosition: {x: -2.2779846, y: 1.7249451}
|
m_AnchoredPosition: {x: -2.2779846, y: 1.7249756}
|
||||||
m_SizeDelta: {x: -11.304703, y: -4.6799927}
|
m_SizeDelta: {x: -11.304703, y: -4.6799927}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1701930269
|
--- !u!114 &1701930269
|
||||||
@ -4628,6 +4660,94 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_interface: {fileID: 0}
|
m_interface: {fileID: 0}
|
||||||
itemName: "\u6C34\u7F38"
|
itemName: "\u6C34\u7F38"
|
||||||
|
--- !u!1 &1771706913
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1771706914}
|
||||||
|
- component: {fileID: 1771706916}
|
||||||
|
- component: {fileID: 1771706915}
|
||||||
|
- component: {fileID: 1771706917}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: "CG\u7BA1\u7406\u5458"
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1771706914
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1771706913}
|
||||||
|
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_Children:
|
||||||
|
- {fileID: 2125100632}
|
||||||
|
m_Father: {fileID: 2052706945}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 4.6221924, y: 2.7635498}
|
||||||
|
m_SizeDelta: {x: 8.48999, y: 5.52771}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1771706915
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1771706913}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 13f98ebc3ada70246924ffad2dbc7d2b, type: 3}
|
||||||
|
m_UVRect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 1
|
||||||
|
height: 1
|
||||||
|
--- !u!222 &1771706916
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1771706913}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1771706917
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1771706913}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fbae1877cad284d4d82f60cbb5878baa, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
CGs:
|
||||||
|
- {fileID: 2125100633}
|
||||||
--- !u!1 &1773029877
|
--- !u!1 &1773029877
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -5375,6 +5495,7 @@ MonoBehaviour:
|
|||||||
rateOfChangeOfThrowingAngle: 1
|
rateOfChangeOfThrowingAngle: 1
|
||||||
strengthOfThrowing: 8
|
strengthOfThrowing: 8
|
||||||
stageName:
|
stageName:
|
||||||
|
CGFadeTime: 1
|
||||||
--- !u!4 &2039349954
|
--- !u!4 &2039349954
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -5551,6 +5672,7 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1500782588}
|
- {fileID: 1500782588}
|
||||||
|
- {fileID: 1771706914}
|
||||||
m_Father: {fileID: 1860666399}
|
m_Father: {fileID: 1860666399}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@ -5665,7 +5787,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.028, y: 0.8655201}
|
m_AnchorMin: {x: 0.028, y: 0.8655201}
|
||||||
m_AnchorMax: {x: 0.2527861, y: 0.95120806}
|
m_AnchorMax: {x: 0.2527861, y: 0.95120806}
|
||||||
m_AnchoredPosition: {x: 1.0002136, y: -0.1533966}
|
m_AnchoredPosition: {x: 1.0002441, y: -0.1533966}
|
||||||
m_SizeDelta: {x: -6.6341, y: -3.6931992}
|
m_SizeDelta: {x: -6.6341, y: -3.6931992}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2083069445
|
--- !u!114 &2083069445
|
||||||
@ -5748,6 +5870,52 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &2125100631
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2125100632}
|
||||||
|
- component: {fileID: 2125100633}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: "CG\uFF1A\u6682\u75281"
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &2125100632
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2125100631}
|
||||||
|
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_Children: []
|
||||||
|
m_Father: {fileID: 1771706914}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &2125100633
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2125100631}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ab6d265b5e187da4bbc927caf02b681e, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
CGName: "\u6682\u7528"
|
||||||
|
texture: {fileID: 2800000, guid: b480a137df33db449a8cb87e70f6c8d8, type: 3}
|
||||||
|
time: 3
|
||||||
--- !u!1001 &3945938555803748376
|
--- !u!1001 &3945938555803748376
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class WhenTheConversationAfterRecollectionIsCompleted : Event
|
||||||
|
{
|
||||||
|
//事件:当完成回忆后的对话后
|
||||||
|
public override void OnCall()
|
||||||
|
{
|
||||||
|
//此时按照剧本,应该弹出一段CG,字幕【第二天】 -> 父亲渐行渐远动画 -> 字幕【一段时间后】
|
||||||
|
FindObjectOfType<CGAdministrator>().CallACG("暂用");
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 745a70beba46fbb49bc6403acec3e7f0
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -40,6 +40,8 @@ public class IndexRecoder : MonoBehaviour
|
|||||||
public float strengthOfThrowing;
|
public float strengthOfThrowing;
|
||||||
[SerializeField][Tooltip("演出名称,这个不给你改,这个是我做多态用的,在这里只读")][ReadOnly]
|
[SerializeField][Tooltip("演出名称,这个不给你改,这个是我做多态用的,在这里只读")][ReadOnly]
|
||||||
public string stageName;
|
public string stageName;
|
||||||
|
[Tooltip("CG的淡入淡出时间")]
|
||||||
|
public float CGFadeTime;
|
||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
@ -59,7 +61,7 @@ public class IndexRecoder : MonoBehaviour
|
|||||||
codeBook.Add("----.","9");
|
codeBook.Add("----.","9");
|
||||||
codeBook.Add("-----","0");
|
codeBook.Add("-----","0");
|
||||||
|
|
||||||
stageName = "序章-家中-未打码";
|
stageName = "序章-家中-已打码";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
|
15
Assets/Scripts/抽象的东西/ACG.cs
Normal file
15
Assets/Scripts/抽象的东西/ACG.cs
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
//写一个类,代表一个CG,里面保存CG需要的内容
|
||||||
|
public class ACG : MonoBehaviour
|
||||||
|
{
|
||||||
|
[Tooltip("名字,同时也是唯一调用标识,别吐槽我用中文,这里是中国")]
|
||||||
|
public string CGName;
|
||||||
|
[Tooltip("这个CG要显示的东西,据说视频也可以?")]
|
||||||
|
public Texture texture;
|
||||||
|
[Tooltip("这个CG要显示多长时间")]
|
||||||
|
public float time;
|
||||||
|
}
|
||||||
|
|
11
Assets/Scripts/抽象的东西/ACG.cs.meta
Normal file
11
Assets/Scripts/抽象的东西/ACG.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ab6d265b5e187da4bbc927caf02b681e
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
67
Assets/Scripts/抽象的东西/CGAdministrator.cs
Normal file
67
Assets/Scripts/抽象的东西/CGAdministrator.cs
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using UnityEditor;
|
||||||
|
|
||||||
|
public class CGAdministrator : MonoBehaviour
|
||||||
|
{
|
||||||
|
// Start is called before the first frame update
|
||||||
|
//CG管理员相关代码
|
||||||
|
|
||||||
|
private RawImage rawImage;
|
||||||
|
[Tooltip("记录这个场景中的所有CG,要加的话直接扩容数组,并往新的CG里面加内容")]
|
||||||
|
public ACG[] CGs;
|
||||||
|
private IndexRecoder indexRecoder;
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
rawImage = GetComponent<RawImage>();
|
||||||
|
indexRecoder = FindObjectOfType<IndexRecoder>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//外部呼叫CG用,传入你要调用的CG名
|
||||||
|
public void CallACG(string CGName)
|
||||||
|
{
|
||||||
|
//当外面叫了一个CG,传入CG名
|
||||||
|
foreach(ACG CG in CGs)
|
||||||
|
{
|
||||||
|
//找到这个CG
|
||||||
|
if(CG.CGName.Equals(CGName))
|
||||||
|
{
|
||||||
|
Debug.Log("正在显示CG:"+CG.name);
|
||||||
|
rawImage.texture = CG.texture;//把CG的内容装载上
|
||||||
|
rawImage.CrossFadeAlpha(1,indexRecoder.CGFadeTime,true);//淡入显示CG
|
||||||
|
Invoke("StopIt",CG.time);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//改变标记,使管理员意识到CG该停了
|
||||||
|
private void StopIt(){rawImage.CrossFadeAlpha(0f,indexRecoder.CGFadeTime,true);}//淡出CG
|
||||||
|
|
||||||
|
//制造一个只读的变量,不要动这些
|
||||||
|
public class ReadOnlyAttribute : PropertyAttribute{}
|
||||||
|
[CustomPropertyDrawer(typeof(ReadOnlyAttribute))]
|
||||||
|
public class ReadOnlyDrawer : PropertyDrawer
|
||||||
|
{
|
||||||
|
public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
|
||||||
|
{
|
||||||
|
return EditorGUI.GetPropertyHeight(property, label, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
|
||||||
|
{
|
||||||
|
GUI.enabled = false;
|
||||||
|
EditorGUI.PropertyField(position, property, label, true);
|
||||||
|
GUI.enabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//
|
||||||
|
|
||||||
|
}
|
11
Assets/Scripts/抽象的东西/CGAdministrator.cs.meta
Normal file
11
Assets/Scripts/抽象的东西/CGAdministrator.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fbae1877cad284d4d82f60cbb5878baa
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Sprites/暂用过场CG1.jpg
Normal file
BIN
Assets/Sprites/暂用过场CG1.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 99 KiB |
96
Assets/Sprites/暂用过场CG1.jpg.meta
Normal file
96
Assets/Sprites/暂用过场CG1.jpg.meta
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b480a137df33db449a8cb87e70f6c8d8
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
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
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Sprites/透明图层.png
Normal file
BIN
Assets/Sprites/透明图层.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 90 B |
96
Assets/Sprites/透明图层.png.meta
Normal file
96
Assets/Sprites/透明图层.png.meta
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 13f98ebc3ada70246924ffad2dbc7d2b
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
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
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Loading…
x
Reference in New Issue
Block a user