Squashed commit of the following:

commit 4e1d9fbdc15bd87e07144fd97e11874874b6108e
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sun Aug 22 17:06:39 2021 +0800

    提交了夜晚效果Shader和探照灯光源

commit f1069605a261b80f75ad1b27b99c5b66c807fc8c
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sun Aug 22 14:34:46 2021 +0800

    1

commit e2d0423a3b93373ffcd5b9656568715d975077ce
Merge: ca4294b 35d0d80
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 14 07:57:06 2021 +0800

    1

commit ca4294b0bf0a685874be344dbeaa22905f0247b0
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 14 07:43:34 2021 +0800

    1.完善了对话内容,使对话内容更加口语化和方言化。
    2.添加了Shader的框架(与屏幕后特效相关)
     1)加入了LightController的代码文件,主要控制烛光等灯光的空气扰动现象
     2)加入了VolumeController的代码文件,主要与屏幕后特效的控制变量相关
     3)在场景中加入了Volume的对象,控制屏幕后特效Shader的运行
    3.挪动了场景中煤油灯的位置,并且为煤油灯添加了会产生空气扰动使光范围发生变化的功能
    4.为测试场景中的镜子添加了临时提示光边Shader

commit 0e3f372bcfe4695fe4bbe0e1e829bca2a8bb8ebf
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 14 04:44:23 2021 +0800

    1

commit 35d0d808083b71b86483a46024610dc17111d43b
Merge: c8c9c89 bfe6054
Author: Roman <1325980292@qq.com>
Date:   Sat Aug 14 01:43:42 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/88

commit c8c9c895f8aa5f914d4384524dbeedc9d364cecc
Merge: 717b2a1 e28e55e
Author: Roman <1325980292@qq.com>
Date:   Fri Aug 13 00:32:23 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/87

commit 717b2a11cc04dfa3d34650026dc9a0bcd99d450b
Merge: a01fcd5 dc14472
Author: Roman <1325980292@qq.com>
Date:   Thu Aug 12 00:54:29 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/78

commit a01fcd5c0b85c58193efec4715a7d7280544de63
Merge: 454b038 c9a4456
Author: Roman <1325980292@qq.com>
Date:   Wed Aug 11 02:18:50 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/77

commit 454b038d552cf0ab296b2a6461f964de41ac498f
Merge: 2781f7f cc0ed5b
Author: Roman <1325980292@qq.com>
Date:   Wed Aug 11 00:08:10 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/76

commit dac3a2a444a88c074f17f22137e978186aad34da
Author: SAIPO <grasste0403@hotmail.com>
Date:   Mon Aug 9 23:45:01 2021 +0800

    Squashed commit of the following:

    commit 2781f7f874d8b595397c9bc5108186d845fe6bb0
    Merge: 2faf844 b262e57
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 23:15:43 2021 +0800

        详情见最新RomanVers
        Merge Request: ?

        Created By: @Roman
        Accepted By: @Roman
        URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/74

    commit b262e579b24c8ffba6f08a5b79b9577b6d850d8b
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 23:14:55 2021 +0800

        任务:以动画实现移动
        *:实验场景:【各种系统测试与陈列】

        1.创建测试小孩游戏物体
        2.创建新的AC
        3.编写步行动画逻辑
        *:遇到问题,动画似乎不行,移动方式暂时换回原来的。
        *:其余场景没有受到影响

    commit 2faf844f461da8740a63e25413657b264e4eec22
    Merge: 7749e35 0bc1c97
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 21:24:20 2021 +0800

        合并了麒哥的动画包2
        Merge Request: ??

        Created By: @Roman
        Accepted By: @Roman
        URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/73

    commit 0bc1c970e5ec4d993a0c81c7149901408664df76
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 21:23:33 2021 +0800

        合并了麒哥的动画包2

    commit 7749e35c85f697a28234892cef01b369ef1b8c9c
    Merge: a4d3c53 9b7dbdf
    Author: Roman <1325980292@qq.com>
    Date:   Sat Aug 7 01:32:57 2021 +0800

        详情见RomanVersion最新提交

    commit 9b7dbdf941327c1c891d19e82dc0460abfdb39c4
    Author: Roman <1325980292@qq.com>
    Date:   Sat Aug 7 01:31:29 2021 +0800

        任务:搭建“序章-战场”的整体流程框架
        1.创建可交互电报机这个逻辑物体
        *.在所有脚本首行添加说明方便查看
        2.编写假电报机类,因为这个电报机没有电报机功能,而是一个类似事件的物体。
        3.使假电报机可以分清场景中电话线断裂和修复的情况,并对其做出不同反应。
        4.没修完电报机的反馈等待策划,修完了的等待我明天编写场景的多态系统
        5.均通过了程序简单测试,请各位尽快拉取寻找问题

        下班,别摸了,兄弟们

    commit a4d3c53f64887ad36dd7cdfce6ca8dda59471e8f
    Merge: 2dd6b3a b1dc321
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:31:18 2021 +0800

        傻逼coding,草你妈
        Merge Request: 傻逼coding,草你妈

        Created By: @Roman
        Accepted By: @Roman
        URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/52

    commit b1dc32196aedf51326078a004361078fde8589ca
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:30:24 2021 +0800

        傻逼coding

    commit d816886a9d13de83ff96d0e96358433b95dbcc17
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:28:51 2021 +0800

        ?

    commit 86f446eb05a5150a3933f47f77c28099179a7291
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:26:14 2021 +0800

        测试

    # Conflicts:
    #	UserSettings/EditorUserSettings.asset

commit 2781f7f874d8b595397c9bc5108186d845fe6bb0
Merge: 2faf844 b262e57
Author: Roman <1325980292@qq.com>
Date:   Mon Aug 9 23:15:43 2021 +0800

    详情见最新RomanVers
    Merge Request: ?

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/74

commit 2faf844f461da8740a63e25413657b264e4eec22
Merge: 7749e35 0bc1c97
Author: Roman <1325980292@qq.com>
Date:   Mon Aug 9 21:24:20 2021 +0800

    合并了麒哥的动画包2
    Merge Request: ??

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/73

commit 7749e35c85f697a28234892cef01b369ef1b8c9c
Merge: a4d3c53 9b7dbdf
Author: Roman <1325980292@qq.com>
Date:   Sat Aug 7 01:32:57 2021 +0800

    详情见RomanVersion最新提交

commit a4d3c53f64887ad36dd7cdfce6ca8dda59471e8f
Merge: 2dd6b3a b1dc321
Author: Roman <1325980292@qq.com>
Date:   Mon Jul 26 19:31:18 2021 +0800

    傻逼coding,草你妈
    Merge Request: 傻逼coding,草你妈

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/52

commit 86fc77f246a3d1b76e7ee01539203659b60d4cdd
Author: SAIPO <grasste0403@hotmail.com>
Date:   Mon Jul 26 19:02:49 2021 +0800

    修改bug

# Conflicts:
#	Assets/Prefabs/敌人.meta
#	Assets/Prefabs/敌人/机枪手.prefab.meta
#	Assets/Scenes/第二关.unity
#	Assets/图/动画包2.unitypackage.meta
#	UserSettings/EditorUserSettings.asset
This commit is contained in:
Roman 2021-08-22 19:40:11 +08:00
parent 4e1c749c8e
commit fdca717a14
4 changed files with 184 additions and 16 deletions

View File

@ -4812,7 +4812,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1861856986}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -11.039029, y: 0.08661765, z: -10}
m_LocalPosition: {x: -10.217708, y: 0.083872736, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 716192431}

View File

@ -176,7 +176,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6148935034079004064, guid: b034a6d27e737a9438c2164815880846, type: 3}
propertyPath: m_RootOrder
value: 10
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6148935034079004064, guid: b034a6d27e737a9438c2164815880846, type: 3}
propertyPath: m_LocalPosition.x
@ -242,7 +242,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3}
propertyPath: m_RootOrder
value: 8
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3}
propertyPath: m_LocalPosition.x
@ -599,6 +599,8 @@ Transform:
- {fileID: 98779984}
- {fileID: 1677599719}
- {fileID: 42157489}
- {fileID: 1341601829}
- {fileID: 1309876877}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -648,8 +650,8 @@ MonoBehaviour:
m_LightType: 4
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.52
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Color: {r: 0.43867922, g: 0.6095479, b: 1, a: 1}
m_Intensity: 0.42
m_LightVolumeOpacity: 0
m_ApplyToSortingLayers: 00000000
m_LightCookieSprite: {fileID: 0}
@ -1370,6 +1372,78 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1244141158}
m_CullTransparentMesh: 1
--- !u!1 &1309876876
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1309876877}
- component: {fileID: 1309876878}
m_Layer: 0
m_Name: "\u53F3\u63A2\u7167"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1309876877
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1309876876}
m_LocalRotation: {x: -0, y: -0, z: 0.99998784, w: 0.0049352767}
m_LocalPosition: {x: 98.82, y: 5.04, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 405730575}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180}
--- !u!114 &1309876878
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1309876876}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LightType: 3
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.266
m_Color: {r: 1, g: 0.9018647, b: 0.3726415, a: 1}
m_Intensity: 0.91
m_LightVolumeOpacity: 0
m_ApplyToSortingLayers: 00000000
m_LightCookieSprite: {fileID: 0}
m_UseNormalMap: 0
m_LightOrder: 0
m_AlphaBlendOnOverlap: 0
m_ShadowIntensity: 0
m_ShadowVolumeIntensity: 0
m_PointLightInnerAngle: 70
m_PointLightOuterAngle: 77
m_PointLightInnerRadius: 0
m_PointLightOuterRadius: 8.271632
m_PointLightDistance: 3
m_PointLightQuality: 1
m_ShapeLightParametricSides: 5
m_ShapeLightParametricAngleOffset: 0
m_ShapeLightParametricRadius: 1
m_ShapeLightFalloffSize: 0.5
m_ShapeLightFalloffOffset: {x: 0, y: 0}
m_ShapePath:
- {x: -0.5, y: -0.5, z: 0}
- {x: 0.5, y: -0.5, z: 0}
- {x: 0.5, y: 0.5, z: 0}
- {x: -0.5, y: 0.5, z: 0}
--- !u!1 &1328743941
GameObject:
m_ObjectHideFlags: 0
@ -1421,6 +1495,78 @@ MonoBehaviour:
portraitsFace: 0
setSayDialog: {fileID: 0}
description:
--- !u!1 &1341601828
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1341601829}
- component: {fileID: 1341601830}
m_Layer: 0
m_Name: "\u5DE6\u63A2\u7167"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1341601829
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1341601828}
m_LocalRotation: {x: -0, y: -0, z: 0.99998784, w: 0.0049352767}
m_LocalPosition: {x: 85.89, y: 5.17, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 405730575}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180}
--- !u!114 &1341601830
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1341601828}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LightType: 3
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.266
m_Color: {r: 1, g: 0.9018647, b: 0.3726415, a: 1}
m_Intensity: 0.91
m_LightVolumeOpacity: 0
m_ApplyToSortingLayers: 00000000
m_LightCookieSprite: {fileID: 0}
m_UseNormalMap: 0
m_LightOrder: 0
m_AlphaBlendOnOverlap: 0
m_ShadowIntensity: 0
m_ShadowVolumeIntensity: 0
m_PointLightInnerAngle: 70
m_PointLightOuterAngle: 77
m_PointLightInnerRadius: 0
m_PointLightOuterRadius: 8.271632
m_PointLightDistance: 3
m_PointLightQuality: 1
m_ShapeLightParametricSides: 5
m_ShapeLightParametricAngleOffset: 0
m_ShapeLightParametricRadius: 1
m_ShapeLightFalloffSize: 0.5
m_ShapeLightFalloffOffset: {x: 0, y: 0}
m_ShapePath:
- {x: -0.5, y: -0.5, z: 0}
- {x: 0.5, y: -0.5, z: 0}
- {x: 0.5, y: 0.5, z: 0}
- {x: -0.5, y: 0.5, z: 0}
--- !u!1 &1490143047
GameObject:
m_ObjectHideFlags: 0
@ -2541,7 +2687,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6516117755271630970, guid: 5ad2f573d77b68149b5b3270cac7842f, type: 3}
propertyPath: m_RootOrder
value: 9
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6516117755271630970, guid: 5ad2f573d77b68149b5b3270cac7842f, type: 3}
propertyPath: m_LocalPosition.x

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 29af985829b48094fb08a2663024a254
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6,14 +6,44 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb7df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb
flags: 0
UnityEditor.ShaderGraph.Blackboard:
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
flags: 0
UnityEditor.ShaderGraph.FloatingWindowsLayout2:
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
flags: 0
UnityEditor.ShaderGraph.InspectorWindow:
value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0