Compare commits

..

No commits in common. "ebae4037f85abc817253b33f700b7463dc3a035c" and "8efd7254d16579237b566cbe5ccd791e5d6f0736" have entirely different histories.

5 changed files with 1 additions and 35 deletions

View File

@ -1827,7 +1827,6 @@ MonoBehaviour:
historyPanel: {fileID: 907368012}
IsLoadIn: 0
IsHideLoadPanel: 0
KillNos:
is_jisha: 0
is_jisha_jiesuan: 0
--- !u!114 &142654724
@ -8331,7 +8330,6 @@ MonoBehaviour:
- {fileID: 74076849}
- {fileID: 1725000187}
- {fileID: 728954428}
ReTurnPos: {fileID: 0}
--- !u!1 &718419355
GameObject:
m_ObjectHideFlags: 0
@ -12344,7 +12342,6 @@ MonoBehaviour:
allHouseContro: {fileID: 142654723}
bg: {fileID: 0}
OrPos: {x: 0, y: 0}
allother: {fileID: 716344324}
--- !u!114 &1088858451
MonoBehaviour:
m_ObjectHideFlags: 0
@ -15616,7 +15613,6 @@ MonoBehaviour:
allHouseContro: {fileID: 142654723}
bg: {fileID: 0}
OrPos: {x: 0, y: 0}
allother: {fileID: 716344324}
--- !u!114 &1377318869
MonoBehaviour:
m_ObjectHideFlags: 0
@ -17059,7 +17055,6 @@ MonoBehaviour:
allHouseContro: {fileID: 142654723}
bg: {fileID: 0}
OrPos: {x: 0, y: 0}
allother: {fileID: 716344324}
--- !u!114 &1519901233
MonoBehaviour:
m_ObjectHideFlags: 0
@ -17844,7 +17839,6 @@ MonoBehaviour:
allHouseContro: {fileID: 142654723}
bg: {fileID: 0}
OrPos: {x: 0, y: 0}
allother: {fileID: 716344324}
--- !u!114 &1557156372
MonoBehaviour:
m_ObjectHideFlags: 0
@ -20586,7 +20580,6 @@ MonoBehaviour:
allHouseContro: {fileID: 142654723}
bg: {fileID: 0}
OrPos: {x: 0, y: 0}
allother: {fileID: 716344324}
--- !u!114 &1790882392
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -7,7 +7,6 @@ using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Windows;
using System.Linq;
using static BettingBtn;
using static UnityEditor.Progress;
@ -41,8 +40,6 @@ public class AllHouseContro : MonoBehaviour
public bool IsLoadIn;//是否已经进入游戏
public bool IsHideLoadPanel;//是否关闭加载页面
public List<int> KillNos;//»÷ɱ·¿¼äÁбí
// Start is called before the first frame update
async void Start()
{
@ -305,7 +302,6 @@ public class AllHouseContro : MonoBehaviour
ServerResponse514 serverResponse_514 = JsonConvert.DeserializeObject<ServerResponse514>(response);
string[] parts = serverResponse_514.data.roomNoKill.Split(","); // 根据 ',' 分割字符串d
KillNos = parts.Select(int.Parse).ToList();
int index_ = 0;
foreach (string part in parts) {
if (parts.Length > index_)

View File

@ -85,23 +85,6 @@ public class Allother : MonoBehaviour
}
//¶ÔÓ¦·¿¼äÎÏÅ£»ØÆðʼµã
public void ReturnstartPos(int roomNo)
{
for (int i = 0; i < allHouseContro.HouseBtnList.Count; i++)
{
if (allHouseContro.HouseBtnList[i].roomNo == roomNo)
{
for (int j = 0; j < allHouseContro.HouseBtnList[i].otherWonius.Count; j++)
{
allHouseContro.HouseBtnList[i].otherWonius[j].GetComponent<OtherMove>().EndPos = ReTurnPos;
}
allHouseContro.HouseBtnList[i].otherWonius.Clear();
}
}
}
public void CreateWoniu()
{

View File

@ -20,8 +20,6 @@ public class BossContro : MonoBehaviour
public GameObject bg;
public Vector2 OrPos;
public Allother allother;
// Start is called before the first frame update
void Start()
{

View File

@ -366,11 +366,7 @@ public class PlayerMove : MonoBehaviour
GetComponent<BossContro>().BossAni.SetInteger("State", 2);
yield return new WaitForSeconds(3f);
GetComponent<BossContro>().BossAni.SetInteger("State", 0);
foreach (int nos in allHouseContro.KillNos)
{
GetComponent<BossContro>().allother.KilltheWoniu(nos);
}
allHouseContro.KillNos.Clear();
BettingBtn.instance.GiveMoney(room_id);
yield return new WaitForSeconds(2f);
//allHouseContro.BoosReturn();