5bb8086078
commit 5d812753da2f9af3c5b8640dd11b561df5989be2
Merge: ccdd7a0 ab8a4c2
Author: Roman <1325980292@qq.com>
Date: Sun Jul 25 00:01:19 2021 +0800
自动解决冲突
改他妈的批
commit ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
Merge: 7143da0 d3f9ad1
Author: SAIPO <grasste0403@hotmail.com>
Date: Sat Jul 24 08:29:18 2021 +0800
Accept Merge Request #47: (SaipoVersion -> master)
Merge Request: 2021.7.24合并
Created By: @SAIPO
Accepted By: @SAIPO
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/47
commit d3f9ad1a5cddf188ce9712d34f38824e0c8a7b94
Author: SAIPO <grasste0403@hotmail.com>
Date: Sat Jul 24 08:26:28 2021 +0800
1.增加了老爹的回忆场景，但是人物还没有加入移动，我不大会使呜呜。
2.增加了视觉差parallax的代码，并在第一个场景的背景加入了视差。
3.第一个场景的可交互物品加入了提示灯光（暂定效果）
4.战场加入了硝烟粒子特效
commit 7143da089892804b035ba29538cedcb63d5ed56d
Merge: 3acde21 65f88fd
Author: Roman <1325980292@qq.com>
Date: Sat Jul 24 00:37:00 2021 +0800
Accept Merge Request #46: (RomanVersion -> master)
Merge Request: 试图消除缺少的提交
Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/46
commit 3acde21796f2c88004622004861bb7a1cf270ce5
Merge: 1555869 f5f01f4
Author: Roman <1325980292@qq.com>
Date: Sat Jul 24 00:32:50 2021 +0800
Accept Merge Request #45: (RomanVersion -> master)
Merge Request: 详情见RomanVersion最新提交
Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/45
commit 155586911671e10c0f227fadd163f6eeab840b1f
Merge: 2ed4c0d fb66487
Author: Roman <1325980292@qq.com>
Date: Fri Jul 23 01:22:24 2021 +0800
Accept Merge Request #44: (RomanVersion -> master)
Merge Request: 基本完成投掷框架
Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/44
commit 2ed4c0d161bbb12fd98aa1d7d369d2ba97a52d92
Merge: de8b0b7 40fabec
Author: Roman <1325980292@qq.com>
Date: Tue Jul 20 00:36:16 2021 +0800
Accept Merge Request #42: (RomanVersion -> master)
1.基本完成了句子系统
2.合理化了场景物体分层结构
commit de8b0b745393539c01ea98527475a09bcdb26af3
Merge: 87be157 e6f51b1
Author: Roman <1325980292@qq.com>
Date: Sun Jul 18 23:59:59 2021 +0800
Accept Merge Request #32: (RomanVersion -> master)
详情见RomanVersion的最新提交
# Conflicts:
# UserSettings/EditorUserSettings.asset
Playmaker ============ Playmaker is a Finite State Machine plugin for Unity that allows developers to create games using a visual scripting methodology that does away with writing code in a manner similar to Fungus. The FSM allows the creation of various states and events for a given object that allows for the wuick and easy creation of object behaviours and AI for NPCs and enemies. By combining the Playmaker FSM with Fungus' ability to create engaging, character driven story based games, it is hoped that developers will be able to create games that combine the best features of both. Installation ============ 1. Download and install the Playmaker runtime unitypackage in your Unity project http://sites.fastspring.com/hutonggames/product/playmaker https://www.assetstore.unity3d.com/en/#!/content/368 2. Install the Fungus-PlayMaker.unitypackage in your Unity project. This file is located in the same folder as this text file. 3. Open the Fungus-PlayMaker/Scenes/Fungus Playmaker Example Scene for an example of how to use the Spine commands Usage ============ To write Playmaker variable values to Fungus Variables, use the Action Browser > ScriptControl > Write To Fungus command. To execute a block in a Fungus flowchart from , use the Action Browser > ScriptControl > Playmaker Execute Block command. To trigger a global state transition in Playmaker from Fungus, use the Playmaker > Global State Transition command. To read Fungus variable values into Playmaker Variables, use the Action Browser > ScriptControl > Receive Fungus Variable command. To write Fungus variable values from the inspector into Playmaker global variables, use the Playmaker > Write To Playmaker command.