|
@@ -6,7 +6,85 @@
|
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
|
|
<list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" beforeDir="false" afterPath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" afterDir="false" />
|
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/DOTweenSettings.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Clipping/Clipping.prefab" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Koharu/Koharu.prefab" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.expressionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.expressionList.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.fadeMotionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.fadeMotionList.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/Mao.prefab" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_01.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_01.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_02.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_02.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_03.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_03.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_04.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_04.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_05.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_05.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_06.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_06.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_07.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_07.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_08.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/expressions/exp_08.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_01.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_02.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_03.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/mtn_04.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/sample_01.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_01.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_02.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Mao/motions/special_03.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.expressionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.expressionList.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.fadeMotionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.fadeMotionList.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/Natori.prefab" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_00.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_00.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_01.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_01.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_02.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_02.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_03.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_03.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_04.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_04.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_05.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_05.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_06.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_06.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_07.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_07.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_08.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_08.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_09.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_09.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_10.exp3.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/exp/exp_10.exp3.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_00.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_01.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_02.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_03.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_04.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_05.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_06.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_07.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Natori/motions/mtn_08.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.fadeMotionList.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.fadeMotionList.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/Rice.prefab" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_00.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_01.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_02.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.anim" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.anim" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.fade.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Samples/Models/Rice/motions/mtn_03.fade.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/UserSettings/Layouts/default-2022.dwlt" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/Layouts/default-2022.dwlt" afterDir="false" />
|
|
|
</list>
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -36,46 +114,43 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
</component>
|
|
|
- <component name="PropertiesComponent">{
|
|
|
|
|
- "keyToString": {
|
|
|
|
|
- "ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
|
|
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
- "RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
- "WebServerToolWindowFactoryState": "false",
|
|
|
|
|
- "XThreadsFramesViewSplitterKey": "0.5252396",
|
|
|
|
|
- "git-widget-placeholder": "H5sdk",
|
|
|
|
|
- "node.js.detected.package.eslint": "true",
|
|
|
|
|
- "node.js.detected.package.tslint": "true",
|
|
|
|
|
- "node.js.selected.package.eslint": "(autodetect)",
|
|
|
|
|
- "node.js.selected.package.tslint": "(autodetect)",
|
|
|
|
|
- "nodejs_package_manager_path": "npm",
|
|
|
|
|
- "vue.rearranger.settings.migration": "true",
|
|
|
|
|
- "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
|
|
|
|
|
|
|
+ <component name="PropertiesComponent"><![CDATA[{
|
|
|
|
|
+ "keyToString": {
|
|
|
|
|
+ "ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
|
|
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
+ "RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
+ "RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
|
|
|
|
+ "WebServerToolWindowFactoryState": "false",
|
|
|
|
|
+ "XThreadsFramesViewSplitterKey": "0.5252396",
|
|
|
|
|
+ "git-widget-placeholder": "master",
|
|
|
|
|
+ "node.js.detected.package.eslint": "true",
|
|
|
|
|
+ "node.js.detected.package.tslint": "true",
|
|
|
|
|
+ "node.js.selected.package.eslint": "(autodetect)",
|
|
|
|
|
+ "node.js.selected.package.tslint": "(autodetect)",
|
|
|
|
|
+ "nodejs_package_manager_path": "npm",
|
|
|
|
|
+ "vue.rearranger.settings.migration": "true",
|
|
|
|
|
+ "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
|
|
|
}
|
|
}
|
|
|
-}</component>
|
|
|
|
|
|
|
+}]]></component>
|
|
|
<component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
|
|
<component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
|
|
|
<configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
|
|
<configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
|
|
|
- <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
|
|
|
|
|
|
|
+ <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2022.3.0f1c1\Editor\Unity.exe" />
|
|
|
<option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -debugCodeOptimization" />
|
|
<option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -debugCodeOptimization" />
|
|
|
<option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
|
|
<option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
|
|
|
<option name="PASS_PARENT_ENVS" value="1" />
|
|
<option name="PASS_PARENT_ENVS" value="1" />
|
|
|
- <option name="USE_EXTERNAL_CONSOLE" value="0" />
|
|
|
|
|
<option name="ENV_FILE_PATHS" value="" />
|
|
<option name="ENV_FILE_PATHS" value="" />
|
|
|
<option name="REDIRECT_INPUT_PATH" value="" />
|
|
<option name="REDIRECT_INPUT_PATH" value="" />
|
|
|
- <option name="PTY_MODE" value="Auto" />
|
|
|
|
|
<option name="MIXED_MODE_DEBUG" value="0" />
|
|
<option name="MIXED_MODE_DEBUG" value="0" />
|
|
|
<method v="2" />
|
|
<method v="2" />
|
|
|
</configuration>
|
|
</configuration>
|
|
|
<configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
|
|
<configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
|
|
|
- <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
|
|
|
|
|
|
|
+ <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2022.3.0f1c1\Editor\Unity.exe" />
|
|
|
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
|
|
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
|
|
|
<option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
|
|
<option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
|
|
|
<option name="PASS_PARENT_ENVS" value="1" />
|
|
<option name="PASS_PARENT_ENVS" value="1" />
|
|
|
- <option name="USE_EXTERNAL_CONSOLE" value="0" />
|
|
|
|
|
<option name="ENV_FILE_PATHS" value="" />
|
|
<option name="ENV_FILE_PATHS" value="" />
|
|
|
<option name="REDIRECT_INPUT_PATH" value="" />
|
|
<option name="REDIRECT_INPUT_PATH" value="" />
|
|
|
- <option name="PTY_MODE" value="Auto" />
|
|
|
|
|
<option name="MIXED_MODE_DEBUG" value="0" />
|
|
<option name="MIXED_MODE_DEBUG" value="0" />
|
|
|
<method v="2" />
|
|
<method v="2" />
|
|
|
</configuration>
|
|
</configuration>
|
|
@@ -107,7 +182,7 @@
|
|
|
<option name="useMixedMode" value="false" />
|
|
<option name="useMixedMode" value="false" />
|
|
|
<method v="2" />
|
|
<method v="2" />
|
|
|
</configuration>
|
|
</configuration>
|
|
|
- <configuration name="附加到设备" type="UnityDevicePlayer" factoryName="UnityAttachToDevicePlayer">
|
|
|
|
|
|
|
+ <configuration name="附加到" type="UnityDevicePlayer" factoryName="UnityAttachToDevicePlayer">
|
|
|
<method v="2" />
|
|
<method v="2" />
|
|
|
</configuration>
|
|
</configuration>
|
|
|
</component>
|
|
</component>
|
|
@@ -153,6 +228,7 @@
|
|
|
<workItem from="1761658194047" duration="1891000" />
|
|
<workItem from="1761658194047" duration="1891000" />
|
|
|
<workItem from="1761745064582" duration="351000" />
|
|
<workItem from="1761745064582" duration="351000" />
|
|
|
<workItem from="1761798323592" duration="6580000" />
|
|
<workItem from="1761798323592" duration="6580000" />
|
|
|
|
|
+ <workItem from="1765455415992" duration="1066000" />
|
|
|
</task>
|
|
</task>
|
|
|
<servers />
|
|
<servers />
|
|
|
</component>
|
|
</component>
|
|
@@ -175,14 +251,7 @@
|
|
|
<line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
<line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
|
<url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
|
|
<url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
|
|
|
<line>325</line>
|
|
<line>325</line>
|
|
|
- <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'OnLoadConfigsEnterGame'">
|
|
|
|
|
- <startOffsets>
|
|
|
|
|
- <option value="13223" />
|
|
|
|
|
- </startOffsets>
|
|
|
|
|
- <endOffsets>
|
|
|
|
|
- <option value="13241" />
|
|
|
|
|
- </endOffsets>
|
|
|
|
|
- </properties>
|
|
|
|
|
|
|
+ <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'OnLoadConfigsEnterGame'" />
|
|
|
<option name="timeStamp" value="46" />
|
|
<option name="timeStamp" value="46" />
|
|
|
</line-breakpoint>
|
|
</line-breakpoint>
|
|
|
<line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
<line-breakpoint enabled="true" type="DotNet Breakpoints">
|