长虹新仓库

.gitignore

@@ -1,4 +1,17 @@
-/wb_unity_pro_2/
-wb_unity_pro_2/
-/wb_unity_pro_3/
-wb_unity_pro_3/
+# 忽略所有文件和文件夹
+*
+# 上传两个文件夹
+!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

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

wb_unity_pro/Assets/Scripts.rar.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f36540930dace814fb5794d1e03d85b2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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",

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"
+  }
+]

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}

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

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