diff --git a/.gitignore b/.gitignore
index 34da343e..61c1565d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,17 @@
-/wb_unity_pro_2/
-wb_unity_pro_2/
-/wb_unity_pro_3/
-wb_unity_pro_3/
\ No newline at end of file
+# 忽略所有文件和文件夹
+*
+# 上传两个文件夹
+!lua_probject/
+!wb_unity_pro/
+!wb_new_ui/
+!.vscode/
+!wb_unity_pro_ios/
+!xcode/
+
+!lua_probject/**
+!wb_unity_pro/**
+!wb_new_ui/**
+!.vscode/**
+!wb_unity_pro_ios**
+!xcode/**
+!.gitignore
\ No newline at end of file
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone2.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone2.lua
index e1cd3ac0..61286a37 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone2.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone2.lua
@@ -443,30 +443,30 @@ function M:GetPropLog(index)
             self.groupumberTemp.valid_round = info.valid_count * 100
             self.groupumberTemp.reward_hp = info.pump
             self.groupumberTemp.total_win = 0
-            self.groupumberTemp.hpall = {}
-            self.groupumberTemp.hpall.hp = info.hp_num1
-            self.groupumberTemp.hpall.total_member = info.member_num or 0
-            self:InsertTableRecord(1, self.groupumberTemp)
-            self._selectedLev = 1
-            self._selectIndex = 1
-            self._selectIndexList[self._selectedLev] = self._selectIndex
-            self:LevGetRecordData(0, self.groupumberTemp)
-            ViewUtil.CloseModalWait()
-            -- fgCtr:FG_GetMembersCount(self.group_id, function(res)
-            --     ViewUtil.CloseModalWait()
-            --     if res.ReturnCode == 0 then
-            --         self.groupumberTemp.hpall = {}
-            --         self.groupumberTemp.hpall.hp = res.Data.hp_num1 + res.Data.otherHp
-            --         self.groupumberTemp.hpall.total_member = res.Data.member_num
-            --         self:InsertTableRecord(1, self.groupumberTemp)
-            --         self._selectedLev = 1
-            --         self._selectIndex = 1
-            --         self._selectIndexList[self._selectedLev] = self._selectIndex
-            --         self:LevGetRecordData(0, self.groupumberTemp)
-            --     else
-            --         ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值")
-            --     end
-            -- end)
+            -- self.groupumberTemp.hpall = {}
+            -- self.groupumberTemp.hpall.hp = info.hp_num1
+            -- self.groupumberTemp.hpall.total_member = info.member_num or 0
+            -- self:InsertTableRecord(1, self.groupumberTemp)
+            -- self._selectedLev = 1
+            -- self._selectIndex = 1
+            -- self._selectIndexList[self._selectedLev] = self._selectIndex
+            -- self:LevGetRecordData(0, self.groupumberTemp)
+            -- ViewUtil.CloseModalWait()
+            fgCtr:FG_GetMembersCount(self.group_id, function(res)
+                ViewUtil.CloseModalWait()
+                if res.ReturnCode == 0 then
+                    self.groupumberTemp.hpall = {}
+                    self.groupumberTemp.hpall.hp = res.Data.hp_num1 + res.Data.otherHp
+                    self.groupumberTemp.hpall.total_member = res.Data.member_num
+                    self:InsertTableRecord(1, self.groupumberTemp)
+                    self._selectedLev = 1
+                    self._selectIndex = 1
+                    self._selectIndexList[self._selectedLev] = self._selectIndex
+                    self:LevGetRecordData(0, self.groupumberTemp)
+                else
+                    ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值")
+                end
+            end)
         end
     end)
 end
diff --git a/wb_unity_pro/Assets/Scripts.rar b/wb_unity_pro/Assets/Scripts.rar
new file mode 100644
index 00000000..cb01dbc7
Binary files /dev/null and b/wb_unity_pro/Assets/Scripts.rar differ
diff --git a/wb_unity_pro/Assets/Scripts.rar.meta b/wb_unity_pro/Assets/Scripts.rar.meta
new file mode 100644
index 00000000..2998975d
--- /dev/null
+++ b/wb_unity_pro/Assets/Scripts.rar.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f36540930dace814fb5794d1e03d85b2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
index 11257cea..f0b38143 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
@@ -1,11 +1,11 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
     "ver": "1.0.6",
diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes
similarity index 99%
rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes
rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes
index 9a452f48..acf9dbdf 100644
Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes
deleted file mode 100644
index 085fd120..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
deleted file mode 100644
index b5c84a1d..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes
deleted file mode 100644
index e94d9aaa..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
deleted file mode 100644
index db21553b..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes
deleted file mode 100644
index e4a139fc..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
deleted file mode 100644
index 3b03375e..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes
deleted file mode 100644
index 9853a37d..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes
deleted file mode 100644
index 7d5c12b6..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
deleted file mode 100644
index c31468bd..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes
deleted file mode 100644
index d9e4831f..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
deleted file mode 100644
index b1d8806b..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes
deleted file mode 100644
index 567b7d83..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/config/asset_config1.0.7.json b/wb_unity_pro/Pack/config/asset_config1.0.7.json
new file mode 100644
index 00000000..dc78694d
--- /dev/null
+++ b/wb_unity_pro/Pack/config/asset_config1.0.7.json
@@ -0,0 +1,98 @@
+[
+  {
+    "lua_path": "/tolua_project,/base_project,/main_project",
+    "ver": "1.0.7",
+    "name": "base_script",
+    "check": true,
+    "bundle": "base/base_script",
+    "version": "1.0.7"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "common",
+    "check": true,
+    "bundle": "base/common",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "login",
+    "check": true,
+    "bundle": "base/login",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "lobby",
+    "check": true,
+    "bundle": "base/lobby",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "chat",
+    "check": true,
+    "bundle": "base/chat",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "newgroup",
+    "bundle": "base/newgroup",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "rank",
+    "version": "1.0.6",
+    "bundle": "base/rank"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "main_majiang",
+    "check": true,
+    "version": "1.0.6",
+    "bundle": "base/main_majiang"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "main_poker",
+    "version": "1.0.6",
+    "bundle": "base/main_poker"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "main_zipai",
+    "version": "1.0.6",
+    "bundle": "base/main_zipai"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "static",
+    "check": true,
+    "bundle": "base/static",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "is_res": true,
+    "name": "embed",
+    "check": true,
+    "bundle": "base/embed",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "main_pokemajiang",
+    "check": true,
+    "version": "1.0.6",
+    "bundle": "base/main_pokemajiang"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "main_zipaimajiang",
+    "check": true,
+    "version": "1.0.6",
+    "bundle": "base/main_zipaimajiang"
+  }
+]
diff --git a/wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.7.bytes
similarity index 99%
rename from wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.6.bytes
rename to wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.7.bytes
index 90a2692e..3c5ac557 100644
Binary files a/wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/iOS/base/chat/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/chat/asset_pack1.0.6.bytes
deleted file mode 100644
index 39b4bf3f..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/chat/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/common/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/common/asset_pack1.0.6.bytes
deleted file mode 100644
index 565c4665..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/common/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/embed/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/embed/asset_pack1.0.6.bytes
deleted file mode 100644
index a9e60977..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/embed/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/lobby/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/lobby/asset_pack1.0.6.bytes
deleted file mode 100644
index 4c21c7cd..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/lobby/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/login/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/login/asset_pack1.0.6.bytes
deleted file mode 100644
index 5d92ccad..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/login/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/main_majiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/main_majiang/asset_pack1.0.6.bytes
deleted file mode 100644
index d7acb6e9..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/main_majiang/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/main_pokemajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/main_pokemajiang/asset_pack1.0.6.bytes
deleted file mode 100644
index 9713bc65..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/main_pokemajiang/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/main_poker/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/main_poker/asset_pack1.0.6.bytes
deleted file mode 100644
index 7e850402..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/main_poker/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/main_zipai/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/main_zipai/asset_pack1.0.6.bytes
deleted file mode 100644
index 5365cd1c..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/main_zipai/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/main_zipaimajiang/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/main_zipaimajiang/asset_pack1.0.6.bytes
deleted file mode 100644
index 1791d301..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/main_zipaimajiang/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/newgroup/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/newgroup/asset_pack1.0.6.bytes
deleted file mode 100644
index f0e71204..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/newgroup/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/rank/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/rank/asset_pack1.0.6.bytes
deleted file mode 100644
index 5e9c2808..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/rank/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/iOS/base/static/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/iOS/base/static/asset_pack1.0.6.bytes
deleted file mode 100644
index 8ede9402..00000000
Binary files a/wb_unity_pro/Pack/iOS/base/static/asset_pack1.0.6.bytes and /dev/null differ
diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
index 4f4dac17..ad8f23e5 100644
--- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
+++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
index 53573008..6df0630b 100644
--- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset
+++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset
@@ -179,8 +179,8 @@ PlayerSettings:
   buildNumber:
     iPhone: 1
   AndroidBundleVersionCode: 12
-  AndroidMinSdkVersion: 26
-  AndroidTargetSdkVersion: 26
+  AndroidMinSdkVersion: 30
+  AndroidTargetSdkVersion: 30
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 0
diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes b/wb_unity_pro/测试报毒.apk
similarity index 69%
rename from wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
rename to wb_unity_pro/测试报毒.apk
index 6611ab21..78d8da17 100644
Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes and b/wb_unity_pro/测试报毒.apk differ
diff --git a/wb_unity_pro_ios/.gitignore b/wb_unity_pro_ios/.gitignore
new file mode 100644
index 00000000..1f246609
--- /dev/null
+++ b/wb_unity_pro_ios/.gitignore
@@ -0,0 +1,27 @@
+[Ll]ibrary/
+[Tt]emp/
+[Oo]bj/
+[Bb]uild/
+
+# Autogenerated VS/MD solution and project files
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+
+# Unity3D generated meta files
+*.pidb.meta
+
+# Unity3D Generated File On Crash Reports
+sysinfo.txt
+/Assets/UnityVS.meta
+/Assets/UnityVS
+/UnityVS.tolua.v11.suo
+/UnityVS.tolua.CSharp.csproj
+/UnityVS.tolua.CSharp.Editor.csproj
+/UnityVS.tolua.sln