“hujiajun” 4 months ago
parent
commit
4a62fbe4da
100 changed files with 125 additions and 100 deletions
  1. 3 45
      Assets/Scenes/16-9.unity
  2. 47 5
      Assets/Scenes/16-9green.unity
  3. 45 3
      Assets/Scenes/32-9green.unity
  4. 1 43
      Assets/Scenes/Main.unity
  5. 8 0
      Assets/Scripts.meta
  6. 1 1
      Assets/Scripts/1.txt
  7. 0 0
      Assets/Scripts/1.txt.meta
  8. 0 0
      Assets/Scripts/AesEncryption.cs
  9. 0 0
      Assets/Scripts/AesEncryption.cs.meta
  10. 0 0
      Assets/Scripts/CaoZuoRizhi.cs
  11. 0 0
      Assets/Scripts/CaoZuoRizhi.cs.meta
  12. 10 0
      Assets/Scripts/ChangePass.cs
  13. 0 0
      Assets/Scripts/ChangePass.cs.meta
  14. 0 0
      Assets/Scripts/CheckCanvas.cs
  15. 0 0
      Assets/Scripts/CheckCanvas.cs.meta
  16. 0 0
      Assets/Scripts/DataManager.cs
  17. 0 0
      Assets/Scripts/DataManager.cs.meta
  18. 0 0
      Assets/Scripts/DianLiItem.cs
  19. 0 0
      Assets/Scripts/DianLiItem.cs.meta
  20. 10 3
      Assets/Scripts/DianLiJianKongManager.cs
  21. 0 0
      Assets/Scripts/DianLiJianKongManager.cs.meta
  22. 0 0
      Assets/Scripts/DianLiManager.cs
  23. 0 0
      Assets/Scripts/DianLiManager.cs.meta
  24. 0 0
      Assets/Scripts/DianLiangTuBIaoManager.cs
  25. 0 0
      Assets/Scripts/DianLiangTuBIaoManager.cs.meta
  26. 0 0
      Assets/Scripts/GPUManager.cs
  27. 0 0
      Assets/Scripts/GPUManager.cs.meta
  28. 0 0
      Assets/Scripts/GaoJingJiLu.cs
  29. 0 0
      Assets/Scripts/GaoJingJiLu.cs.meta
  30. 0 0
      Assets/Scripts/GaoJingManager.cs
  31. 0 0
      Assets/Scripts/GaoJingManager.cs.meta
  32. 0 0
      Assets/Scripts/GetMainTexture2D.cs
  33. 0 0
      Assets/Scripts/GetMainTexture2D.cs.meta
  34. 0 0
      Assets/Scripts/GetTexture2D.cs
  35. 0 0
      Assets/Scripts/GetTexture2D.cs.meta
  36. 0 0
      Assets/Scripts/JiFangLeftItem.cs
  37. 0 0
      Assets/Scripts/JiFangLeftItem.cs.meta
  38. 0 0
      Assets/Scripts/JiGuiItem.cs
  39. 0 0
      Assets/Scripts/JiGuiItem.cs.meta
  40. 0 0
      Assets/Scripts/JiLongItem.cs
  41. 0 0
      Assets/Scripts/JiLongItem.cs.meta
  42. 0 0
      Assets/Scripts/JiLuItem.cs
  43. 0 0
      Assets/Scripts/JiLuItem.cs.meta
  44. 0 0
      Assets/Scripts/JianKongPTManager.cs
  45. 0 0
      Assets/Scripts/JianKongPTManager.cs.meta
  46. 0 0
      Assets/Scripts/JieKouDiaoYongRiZhi.cs
  47. 0 0
      Assets/Scripts/JieKouDiaoYongRiZhi.cs.meta
  48. 0 0
      Assets/Scripts/JieKouRiZhiItem.cs
  49. 0 0
      Assets/Scripts/JieKouRiZhiItem.cs.meta
  50. 0 0
      Assets/Scripts/K8SManager.cs
  51. 0 0
      Assets/Scripts/K8SManager.cs.meta
  52. 0 0
      Assets/Scripts/LoadModelAB.cs
  53. 0 0
      Assets/Scripts/LoadModelAB.cs.meta
  54. 0 0
      Assets/Scripts/LoginManager.cs
  55. 0 0
      Assets/Scripts/LoginManager.cs.meta
  56. 0 0
      Assets/Scripts/MainCenterManager.cs
  57. 0 0
      Assets/Scripts/MainCenterManager.cs.meta
  58. 0 0
      Assets/Scripts/MainLeftCaiDanItem.cs
  59. 0 0
      Assets/Scripts/MainLeftCaiDanItem.cs.meta
  60. 0 0
      Assets/Scripts/MainLeftManager.cs
  61. 0 0
      Assets/Scripts/MainLeftManager.cs.meta
  62. 0 0
      Assets/Scripts/MainManager.cs
  63. 0 0
      Assets/Scripts/MainManager.cs.meta
  64. 0 0
      Assets/Scripts/Manager.cs
  65. 0 0
      Assets/Scripts/Manager.cs.meta
  66. 0 0
      Assets/Scripts/New Scene.unity
  67. 0 0
      Assets/Scripts/New Scene.unity.meta
  68. 0 0
      Assets/Scripts/PieValue.cs
  69. 0 0
      Assets/Scripts/PieValue.cs.meta
  70. 0 0
      Assets/Scripts/RiZhiItem.cs
  71. 0 0
      Assets/Scripts/RiZhiItem.cs.meta
  72. 0 0
      Assets/Scripts/RingValue.cs
  73. 0 0
      Assets/Scripts/RingValue.cs.meta
  74. 0 0
      Assets/Scripts/RoomToggleChoose.cs
  75. 0 0
      Assets/Scripts/RoomToggleChoose.cs.meta
  76. 0 0
      Assets/Scripts/ServerRoomManager.cs
  77. 0 0
      Assets/Scripts/ServerRoomManager.cs.meta
  78. 0 0
      Assets/Scripts/ServerRoomVideoManager.cs
  79. 0 0
      Assets/Scripts/ServerRoomVideoManager.cs.meta
  80. 0 0
      Assets/Scripts/SetWebGLText.cs
  81. 0 0
      Assets/Scripts/SetWebGLText.cs.meta
  82. 0 0
      Assets/Scripts/ShiPingJianKongManager.cs
  83. 0 0
      Assets/Scripts/ShiPingJianKongManager.cs.meta
  84. 0 0
      Assets/Scripts/ShuJuYuanGuanLi.cs
  85. 0 0
      Assets/Scripts/ShuJuYuanGuanLi.cs.meta
  86. 0 0
      Assets/Scripts/ShuJuYuanItem.cs
  87. 0 0
      Assets/Scripts/ShuJuYuanItem.cs.meta
  88. 0 0
      Assets/Scripts/SixServerManager.cs
  89. 0 0
      Assets/Scripts/SixServerManager.cs.meta
  90. 0 0
      Assets/Scripts/SkipLogo.cs
  91. 0 0
      Assets/Scripts/SkipLogo.cs.meta
  92. 0 0
      Assets/Scripts/TimeManager.cs
  93. 0 0
      Assets/Scripts/TimeManager.cs.meta
  94. 0 0
      Assets/Scripts/TongSuanManager.cs
  95. 0 0
      Assets/Scripts/TongSuanManager.cs.meta
  96. 0 0
      Assets/Scripts/TopManager.cs
  97. 0 0
      Assets/Scripts/TopManager.cs.meta
  98. 0 0
      Assets/Scripts/UIBG.cs
  99. 0 0
      Assets/Scripts/UIBG.cs.meta
  100. 0 0
      Assets/Scripts/UIScrollScript.cs

File diff suppressed because it is too large
+ 3 - 45
Assets/Scenes/16-9.unity


File diff suppressed because it is too large
+ 47 - 5
Assets/Scenes/16-9green.unity


File diff suppressed because it is too large
+ 45 - 3
Assets/Scenes/32-9green.unity


File diff suppressed because it is too large
+ 1 - 43
Assets/Scenes/Main.unity


+ 8 - 0
Assets/Scripts.meta

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

+ 1 - 1
Assets/1.txt → Assets/Scripts/1.txt

@@ -1 +1 @@
-一二三四五六七八九十月年日星期1234567890选择日期
+一二三四五六七八九十月年日星期1234567890选择日期点哥

+ 0 - 0
Assets/1.txt.meta → Assets/Scripts/1.txt.meta


+ 0 - 0
Assets/AesEncryption.cs → Assets/Scripts/AesEncryption.cs


+ 0 - 0
Assets/AesEncryption.cs.meta → Assets/Scripts/AesEncryption.cs.meta


+ 0 - 0
Assets/CaoZuoRizhi.cs → Assets/Scripts/CaoZuoRizhi.cs


+ 0 - 0
Assets/CaoZuoRizhi.cs.meta → Assets/Scripts/CaoZuoRizhi.cs.meta


+ 10 - 0
Assets/ChangePass.cs → Assets/Scripts/ChangePass.cs

@@ -28,6 +28,7 @@ public class ChangePass : MonoBehaviour
     public static passcheck checkpass(string pass)
     {
 
+
         int ct =0;
         string msg = "密码格式缺少:";
         var pwdRegex1 = "(?=.*[0-9])"; // 数字
@@ -147,6 +148,15 @@ public class ChangePass : MonoBehaviour
         terror2.SetActive(false);
         terror3.SetActive(false);
         int ct = checkpass(inputnew1.text).ct;
+
+
+        if(inputold.text==inputnew1.text)
+        {
+            terror3.GetComponent<Text>().text = "新密码不能与旧密码一样";
+            terror3.SetActive(true);
+            return;
+        }
+
         if(ct>=3&&inputnew1.text.Length>=8)
         {   
             string oldpass = AesEncryption.Encrypt(inputold.text);

+ 0 - 0
Assets/ChangePass.cs.meta → Assets/Scripts/ChangePass.cs.meta


+ 0 - 0
Assets/CheckCanvas.cs → Assets/Scripts/CheckCanvas.cs


+ 0 - 0
Assets/CheckCanvas.cs.meta → Assets/Scripts/CheckCanvas.cs.meta


+ 0 - 0
Assets/DataManager.cs → Assets/Scripts/DataManager.cs


+ 0 - 0
Assets/DataManager.cs.meta → Assets/Scripts/DataManager.cs.meta


+ 0 - 0
Assets/DianLiItem.cs → Assets/Scripts/DianLiItem.cs


+ 0 - 0
Assets/DianLiItem.cs.meta → Assets/Scripts/DianLiItem.cs.meta


+ 10 - 3
Assets/DianLiJianKongManager.cs → Assets/Scripts/DianLiJianKongManager.cs

@@ -101,15 +101,22 @@ public class DianLiJianKongManager : UpdateManager
         for (int i = 0; i < sjds.Count; i++)
         {
             GameObject go = GameObject.Instantiate(item.gameObject, item.transform.parent);
-            go.GetComponent<wsdItem>().initData(sjds[i]);
+            go.GetComponent<wsdItem>().initData(sjds[i],i);
             go.SetActive(true);
             items.Add(go);
         }
-
+Debug.Log("wsdItemchoose==>");
         updatetu();
+
+Invoke("chooseitem",1f);
     }
 
+void chooseitem()
+{
+Debug.Log("wsdItemchoose==>2");
 
+        items[0].GetComponent<wsdItem>().chooseitem();
+}
     int chooseroom ;
     public void chooseToggle(int index)
     {
@@ -143,7 +150,7 @@ public class DianLiJianKongManager : UpdateManager
 
         }   
 
-        DataManager.Instance.GetTwoWsdTb(chooseroom, jiguiindex, (data) => {
+        DataManager.Instance.GetTwoWsdTb(ServerRoomManager.chooswsd, jiguiindex, (data) => {
             for (int i = 0; i < data.Count; i++)
             {
                 if(data[i].sdata.Count>0)

+ 0 - 0
Assets/DianLiJianKongManager.cs.meta → Assets/Scripts/DianLiJianKongManager.cs.meta


+ 0 - 0
Assets/DianLiManager.cs → Assets/Scripts/DianLiManager.cs


+ 0 - 0
Assets/DianLiManager.cs.meta → Assets/Scripts/DianLiManager.cs.meta


+ 0 - 0
Assets/DianLiangTuBIaoManager.cs → Assets/Scripts/DianLiangTuBIaoManager.cs


+ 0 - 0
Assets/DianLiangTuBIaoManager.cs.meta → Assets/Scripts/DianLiangTuBIaoManager.cs.meta


+ 0 - 0
Assets/GPUManager.cs → Assets/Scripts/GPUManager.cs


+ 0 - 0
Assets/GPUManager.cs.meta → Assets/Scripts/GPUManager.cs.meta


+ 0 - 0
Assets/GaoJingJiLu.cs → Assets/Scripts/GaoJingJiLu.cs


+ 0 - 0
Assets/GaoJingJiLu.cs.meta → Assets/Scripts/GaoJingJiLu.cs.meta


+ 0 - 0
Assets/GaoJingManager.cs → Assets/Scripts/GaoJingManager.cs


+ 0 - 0
Assets/GaoJingManager.cs.meta → Assets/Scripts/GaoJingManager.cs.meta


+ 0 - 0
Assets/GetMainTexture2D.cs → Assets/Scripts/GetMainTexture2D.cs


+ 0 - 0
Assets/GetMainTexture2D.cs.meta → Assets/Scripts/GetMainTexture2D.cs.meta


+ 0 - 0
Assets/GetTexture2D.cs → Assets/Scripts/GetTexture2D.cs


+ 0 - 0
Assets/GetTexture2D.cs.meta → Assets/Scripts/GetTexture2D.cs.meta


+ 0 - 0
Assets/JiFangLeftItem.cs → Assets/Scripts/JiFangLeftItem.cs


+ 0 - 0
Assets/JiFangLeftItem.cs.meta → Assets/Scripts/JiFangLeftItem.cs.meta


+ 0 - 0
Assets/JiGuiItem.cs → Assets/Scripts/JiGuiItem.cs


+ 0 - 0
Assets/JiGuiItem.cs.meta → Assets/Scripts/JiGuiItem.cs.meta


+ 0 - 0
Assets/JiLongItem.cs → Assets/Scripts/JiLongItem.cs


+ 0 - 0
Assets/JiLongItem.cs.meta → Assets/Scripts/JiLongItem.cs.meta


+ 0 - 0
Assets/JiLuItem.cs → Assets/Scripts/JiLuItem.cs


+ 0 - 0
Assets/JiLuItem.cs.meta → Assets/Scripts/JiLuItem.cs.meta


+ 0 - 0
Assets/JianKongPTManager.cs → Assets/Scripts/JianKongPTManager.cs


+ 0 - 0
Assets/JianKongPTManager.cs.meta → Assets/Scripts/JianKongPTManager.cs.meta


+ 0 - 0
Assets/JieKouDiaoYongRiZhi.cs → Assets/Scripts/JieKouDiaoYongRiZhi.cs


+ 0 - 0
Assets/JieKouDiaoYongRiZhi.cs.meta → Assets/Scripts/JieKouDiaoYongRiZhi.cs.meta


+ 0 - 0
Assets/JieKouRiZhiItem.cs → Assets/Scripts/JieKouRiZhiItem.cs


+ 0 - 0
Assets/JieKouRiZhiItem.cs.meta → Assets/Scripts/JieKouRiZhiItem.cs.meta


+ 0 - 0
Assets/K8SManager.cs → Assets/Scripts/K8SManager.cs


+ 0 - 0
Assets/K8SManager.cs.meta → Assets/Scripts/K8SManager.cs.meta


+ 0 - 0
Assets/LoadModelAB.cs → Assets/Scripts/LoadModelAB.cs


+ 0 - 0
Assets/LoadModelAB.cs.meta → Assets/Scripts/LoadModelAB.cs.meta


+ 0 - 0
Assets/LoginManager.cs → Assets/Scripts/LoginManager.cs


+ 0 - 0
Assets/LoginManager.cs.meta → Assets/Scripts/LoginManager.cs.meta


+ 0 - 0
Assets/MainCenterManager.cs → Assets/Scripts/MainCenterManager.cs


+ 0 - 0
Assets/MainCenterManager.cs.meta → Assets/Scripts/MainCenterManager.cs.meta


+ 0 - 0
Assets/MainLeftCaiDanItem.cs → Assets/Scripts/MainLeftCaiDanItem.cs


+ 0 - 0
Assets/MainLeftCaiDanItem.cs.meta → Assets/Scripts/MainLeftCaiDanItem.cs.meta


+ 0 - 0
Assets/MainLeftManager.cs → Assets/Scripts/MainLeftManager.cs


+ 0 - 0
Assets/MainLeftManager.cs.meta → Assets/Scripts/MainLeftManager.cs.meta


+ 0 - 0
Assets/MainManager.cs → Assets/Scripts/MainManager.cs


+ 0 - 0
Assets/MainManager.cs.meta → Assets/Scripts/MainManager.cs.meta


+ 0 - 0
Assets/Manager.cs → Assets/Scripts/Manager.cs


+ 0 - 0
Assets/Manager.cs.meta → Assets/Scripts/Manager.cs.meta


+ 0 - 0
Assets/New Scene.unity → Assets/Scripts/New Scene.unity


+ 0 - 0
Assets/New Scene.unity.meta → Assets/Scripts/New Scene.unity.meta


+ 0 - 0
Assets/PieValue.cs → Assets/Scripts/PieValue.cs


+ 0 - 0
Assets/PieValue.cs.meta → Assets/Scripts/PieValue.cs.meta


+ 0 - 0
Assets/RiZhiItem.cs → Assets/Scripts/RiZhiItem.cs


+ 0 - 0
Assets/RiZhiItem.cs.meta → Assets/Scripts/RiZhiItem.cs.meta


+ 0 - 0
Assets/RingValue.cs → Assets/Scripts/RingValue.cs


+ 0 - 0
Assets/RingValue.cs.meta → Assets/Scripts/RingValue.cs.meta


+ 0 - 0
Assets/RoomToggleChoose.cs → Assets/Scripts/RoomToggleChoose.cs


+ 0 - 0
Assets/RoomToggleChoose.cs.meta → Assets/Scripts/RoomToggleChoose.cs.meta


+ 0 - 0
Assets/ServerRoomManager.cs → Assets/Scripts/ServerRoomManager.cs


+ 0 - 0
Assets/ServerRoomManager.cs.meta → Assets/Scripts/ServerRoomManager.cs.meta


+ 0 - 0
Assets/ServerRoomVideoManager.cs → Assets/Scripts/ServerRoomVideoManager.cs


+ 0 - 0
Assets/ServerRoomVideoManager.cs.meta → Assets/Scripts/ServerRoomVideoManager.cs.meta


+ 0 - 0
Assets/SetWebGLText.cs → Assets/Scripts/SetWebGLText.cs


+ 0 - 0
Assets/SetWebGLText.cs.meta → Assets/Scripts/SetWebGLText.cs.meta


+ 0 - 0
Assets/ShiPingJianKongManager.cs → Assets/Scripts/ShiPingJianKongManager.cs


+ 0 - 0
Assets/ShiPingJianKongManager.cs.meta → Assets/Scripts/ShiPingJianKongManager.cs.meta


+ 0 - 0
Assets/ShuJuYuanGuanLi.cs → Assets/Scripts/ShuJuYuanGuanLi.cs


+ 0 - 0
Assets/ShuJuYuanGuanLi.cs.meta → Assets/Scripts/ShuJuYuanGuanLi.cs.meta


+ 0 - 0
Assets/ShuJuYuanItem.cs → Assets/Scripts/ShuJuYuanItem.cs


+ 0 - 0
Assets/ShuJuYuanItem.cs.meta → Assets/Scripts/ShuJuYuanItem.cs.meta


+ 0 - 0
Assets/SixServerManager.cs → Assets/Scripts/SixServerManager.cs


+ 0 - 0
Assets/SixServerManager.cs.meta → Assets/Scripts/SixServerManager.cs.meta


+ 0 - 0
Assets/SkipLogo.cs → Assets/Scripts/SkipLogo.cs


+ 0 - 0
Assets/SkipLogo.cs.meta → Assets/Scripts/SkipLogo.cs.meta


+ 0 - 0
Assets/TimeManager.cs → Assets/Scripts/TimeManager.cs


+ 0 - 0
Assets/TimeManager.cs.meta → Assets/Scripts/TimeManager.cs.meta


+ 0 - 0
Assets/TongSuanManager.cs → Assets/Scripts/TongSuanManager.cs


+ 0 - 0
Assets/TongSuanManager.cs.meta → Assets/Scripts/TongSuanManager.cs.meta


+ 0 - 0
Assets/TopManager.cs → Assets/Scripts/TopManager.cs


+ 0 - 0
Assets/TopManager.cs.meta → Assets/Scripts/TopManager.cs.meta


+ 0 - 0
Assets/UIBG.cs → Assets/Scripts/UIBG.cs


+ 0 - 0
Assets/UIBG.cs.meta → Assets/Scripts/UIBG.cs.meta


+ 0 - 0
Assets/UIScrollScript.cs → Assets/Scripts/UIScrollScript.cs


Some files were not shown because too many files changed in this diff