Merge pull request jynew#1138 from qige2016/main

qige2016 · web-flow · commit b38d1e28db59 · 2022-09-03T18:21:30.000+08:00
新增选择函数
diff --git a/jyx2/Assets/BuildSource/Lua/main.lua b/jyx2/Assets/BuildSource/Lua/main.lua
@@ -214,6 +214,7 @@ RoleUseItem = CS.Jyx2.Jyx2LuaBridge.RoleUseItem--指定角色使用物品
 RoleUnequipItem = CS.Jyx2.Jyx2LuaBridge.RoleUnequipItem--指定角色卸下物品（装备）
 ShowMessage = CS.Jyx2.Jyx2LuaBridge.ShowMessage
 ShowYesOrNoSelectPanel = CS.Jyx2.Jyx2LuaBridge.ShowYesOrNoSelectPanel
+ShowSelectPanel = CS.Jyx2.Jyx2LuaBridge.ShowSelectPanel
 function main_getLuaFiles()
 	return {}
 end 
diff --git a/jyx2/Assets/BuildSource/ModelCharacters/BattleNpc/苏星河.prefab b/jyx2/Assets/BuildSource/ModelCharacters/BattleNpc/苏星河.prefab
@@ -382,7 +382,7 @@ Transform:
   m_GameObject: {fileID: 3564018110947300755}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 13.250155, y: 4.999085, z: 13.402915}
-  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3564018110947461589}
   - {fileID: 3564018110947461613}
diff --git a/jyx2/Assets/Mods/SAMPLE/Configs/Datas.bytes b/jyx2/Assets/Mods/SAMPLE/Configs/Datas.bytes
diff --git a/jyx2/Assets/Mods/SAMPLE/Configs/人物.xlsx b/jyx2/Assets/Mods/SAMPLE/Configs/人物.xlsx
diff --git a/jyx2/Assets/Mods/SAMPLE/Configs/物品.xlsx b/jyx2/Assets/Mods/SAMPLE/Configs/物品.xlsx
diff --git a/jyx2/Assets/Mods/SAMPLE/Lua/112.lua b/jyx2/Assets/Mods/SAMPLE/Lua/112.lua
@@ -1,7 +1,7 @@
 Talk(0, "张老板，想跟您打听个事儿。");
 Talk(1110, "什么事？");
 Talk(0, "不知您记不记得，这个月初五晚上，莫桥山庄莫掌门的夫人是不是到店里来买过槟榔啊？");
-Talk(1110, "噢~您说的是那位身材好到爆炸的金露夫人呀！");
+Talk(1110, "噢~您说的是那位貌美如花、身材娇好的金露夫人呀！");
 Talk(0, "额，老板你干嘛突然这么激动。");
 Talk(1110, "我一想起金夫人的姿色就有点。。。嘿嘿。");
 Talk(0, "看来你对她印象很深。");
diff --git a/jyx2/Assets/Mods/SAMPLE/Lua/172.lua b/jyx2/Assets/Mods/SAMPLE/Lua/172.lua
@@ -9,5 +9,5 @@ if ShowYesOrNoSelectPanel("是否购买罗大饼？") == true then goto label0 e
 ::label1::
         Talk(0, "来一张吧。");
         AddItemWithoutHint(174, -10);
-        AddItem(71, 1);
+        AddItem(171, 1);
 do return end;
diff --git a/jyx2/Assets/Mods/SAMPLE/Lua/183.lua b/jyx2/Assets/Mods/SAMPLE/Lua/183.lua
@@ -15,6 +15,10 @@ Talk(0, "等等，你的书掉了。。。");
 jyx2_ReplaceSceneObject("", "Dynamic/无名指法", "1");
 Talk(1180, "送给你吧。。。莫穿林。");
 AddItem(182, 1);
+AddWuchang(0, 20);
+AddQuanzhang(0, 30);
+AddAttack(0, 30);
+AddSpeed(0, 30);
 jyx2_ReplaceSceneObject("", "Dynamic/影子", "");
 jyx2_ReplaceSceneObject("", "Dynamic/无名指法", "");
 ModifyEvent(-2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2);
diff --git a/jyx2/Assets/Mods/SAMPLE/Lua/618.lua b/jyx2/Assets/Mods/SAMPLE/Lua/618.lua
@@ -36,6 +36,12 @@ if TryBattle(61) == true then goto label0 end;
     Talk(0, "也就是说，陶六一会活过来，但我还是死了。");
     Talk(101, "没错，这已经是最幸运的了，因为莫穿林死了就是死了，陶六一可以活，你能选择的，就是以莫穿林的灵魂活下去，还是以陶六一的灵魂活下去。");
     Talk(0, "如果以莫穿林的灵魂活下去，那么陶六一这孩子就彻底死了，如果以陶六一的灵魂活下去，那么。。。我。。。现在就是我在人间最后的时间了。");
-    Talk(101, "没错，你自己选择吧");
-    ModifyEvent(-2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2);
+    Talk(101, "没错，你自己选择吧。");
+    if ShowSelectPanel("请选择以谁的灵魂活下去？", "莫穿林的灵魂", "陶六一的灵魂") == 1 then goto label1 end;
+        Talk(0, "以莫穿林的灵魂活下去。");
+        ModifyEvent(-2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2);
+        do return end;
+::label1::
+        Talk(0, "以陶六一的灵魂活下去。");
+        ModifyEvent(-2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2);
 do return end;
diff --git a/jyx2/Assets/Mods/SAMPLE/Lua/619.lua b/jyx2/Assets/Mods/SAMPLE/Lua/619.lua
@@ -20,4 +20,5 @@ ModifyEvent(-2, 1, -2, -2, 617, -1, -1, -2, -2, -2, -2, -2, -2);
 ModifyEvent(-2, 11, -2, -2, -1, -1, 618, -2, -2, -2, -2, -2, -2);
 jyx2_ReplaceSceneObject("", "NPC/岳不群", "1");
 jyx2_ReplaceSceneObject("", "NPC/雪怪", "1");
+ModifyEvent(-2, -2, -2, -2, -1, -1, -1, -2, -2, -2, -2, -2, -2);
 do return end;
diff --git a/jyx2/Assets/Mods/SAMPLE/Maps/GameMaps/06_jiangjunfu.unity b/jyx2/Assets/Mods/SAMPLE/Maps/GameMaps/06_jiangjunfu.unity
@@ -12724,7 +12724,7 @@ PrefabInstance:
     - target: {fileID: 6902589538327380161, guid: 9e31be4c705c658438161a9870cde964,
         type: 3}
       propertyPath: m_RootOrder
-      value: 14
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 6902589538327380161, guid: 9e31be4c705c658438161a9870cde964,
         type: 3}
@@ -12739,7 +12739,7 @@ PrefabInstance:
     - target: {fileID: 6902589538327380161, guid: 9e31be4c705c658438161a9870cde964,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.081624985
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6902589538327380161, guid: 9e31be4c705c658438161a9870cde964,
         type: 3}
@@ -33903,9 +33903,9 @@ Transform:
   - {fileID: 1969214166}
   - {fileID: 403811409}
   - {fileID: 692157372}
-  - {fileID: 478715442}
   - {fileID: 1561593126}
   - {fileID: 1964257766}
+  - {fileID: 478715442}
   m_Father: {fileID: 226652514}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/jyx2/Assets/Mods/SAMPLE/Maps/GameMaps/15_gezilongtai.unity b/jyx2/Assets/Mods/SAMPLE/Maps/GameMaps/15_gezilongtai.unity
@@ -67453,8 +67453,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1373338658}
-  m_LocalRotation: {x: 0.13932581, y: -0.8608854, z: 0.3575764, w: 0.33407164}
-  m_LocalPosition: {x: 19.2, y: 13.94, z: 12.7}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 0.33407164}
+  m_LocalPosition: {x: 14.75, y: 0, z: 87.630005}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -70846,7 +70846,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1411540022}
   m_LocalRotation: {x: 0.08715578, y: 0, z: 0, w: 0.9961947}
-  m_LocalPosition: {x: -2.22, y: 3, z: -2.37}
+  m_LocalPosition: {x: -3.43, y: 3, z: -2.37}
   m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
   m_Children:
   - {fileID: 1811270769}
diff --git a/jyx2/Assets/Mods/SAMPLE/Models/罂粟谷弟子.asset b/jyx2/Assets/Mods/SAMPLE/Models/罂粟谷弟子.asset
@@ -25,7 +25,7 @@ MonoBehaviour:
       type: {class: SwordPart, ns: Jyx2, asm: Assembly-CSharp}
       data:
         m_Id: 1
-        m_BindBone: mixamorig:RightHand
+        m_BindBone: QuickRigCharacter_RightHand
         m_PartView: {fileID: 1216378884712654, guid: 536d2078b40d14b489a9adc6f0819951,
           type: 3}
         m_OffsetPosition: {x: 0.004, y: 0.083, z: 0.01}
@@ -35,7 +35,7 @@ MonoBehaviour:
       type: {class: KnifePart, ns: Jyx2, asm: Assembly-CSharp}
       data:
         m_Id: 2
-        m_BindBone: mixamorig:RightHand
+        m_BindBone: QuickRigCharacter_RightHand
         m_PartView: {fileID: 1991866320728406, guid: 9a87103d420e21d48afd6c71f13b21c8,
           type: 3}
         m_OffsetPosition: {x: 0.028, y: 0.047, z: 0.038}
@@ -45,7 +45,7 @@ MonoBehaviour:
       type: {class: SpearPart, ns: Jyx2, asm: Assembly-CSharp}
       data:
         m_Id: 3
-        m_BindBone: mixamorig:RightHand
+        m_BindBone: QuickRigCharacter_RightHand
         m_PartView: {fileID: 1225507566611884, guid: e4a8b328034504848b4373bbdaaefd04,
           type: 3}
         m_OffsetPosition: {x: -0.011, y: 0.028, z: 0.029}
diff --git a/jyx2/Assets/Mods/SAMPLE/Timeline/[Timeline]150_野狼谷的记忆.playable b/jyx2/Assets/Mods/SAMPLE/Timeline/[Timeline]150_野狼谷的记忆.playable
diff --git a/jyx2/Assets/Scripts/LuaCore/Jyx2LuaBridge.cs b/jyx2/Assets/Scripts/LuaCore/Jyx2LuaBridge.cs
