diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua index 5c4c59e3..14ce2946 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua @@ -254,7 +254,7 @@ function M:ShowStep(index) head_info:SetBaoDan(false) head_info._view:GetChild('text_jifen').text = player.score - head_info:PlayScore(player.score, win_seat == player.seat) + head_info:PlayScore(player.winscore, win_seat == player.seat) end coroutine.wait(2) diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml index 4dd72708..405bdcab 100644 --- a/wb_new_ui/assets/Hotupdate/Version.xml +++ b/wb_new_ui/assets/Hotupdate/Version.xml @@ -5,14 +5,14 @@ - + - + diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index 3d856218..9411c7a8 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json @@ -1,41 +1,41 @@ [ { - "ver": "1.0.49", + "ver": "1.0.50", "name": "跑得快", "check": true, - "version": "1.0.49", + "version": "1.0.50", "game_id": "66", "bundle": "extend/poker/runfast" }, { - "ver": "1.0.68", + "ver": "1.0.69", "name": "南城麻将", "check": true, - "version": "1.0.68", + "version": "1.0.69", "game_id": "86", "bundle": "extend/majiang/nancheng" }, { - "ver": "1.0.71", + "ver": "1.0.72", "name": "黎川麻将", "check": true, - "version": "1.0.71", + "version": "1.0.72", "game_id": "87", "bundle": "extend/majiang/lichuan" }, { - "ver": "1.0.55", + "ver": "1.0.56", "name": "金溪麻将", "check": true, - "version": "1.0.55", + "version": "1.0.56", "game_id": "88", "bundle": "extend/majiang/jinxi" }, { - "ver": "1.0.54", + "ver": "1.0.55", "name": "抚州麻将", "check": true, - "version": "1.0.54", + "version": "1.0.55", "game_id": "89", "bundle": "extend/majiang/fuzhou" } diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index 20648be7..af385fff 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,109 +1,109 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.7", + "ver": "1.0.8", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "rank", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/rank" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_majiang", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_majiang" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_poker", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_poker" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_zipai", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_zipai" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_pokemajiang", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_zipaimajiang", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes similarity index 98% rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes index ef4499c5..9cb940db 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes similarity index 92% rename from wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes index 9243e3a3..c22fa564 100644 Binary files a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.7.bytes and b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes index 44de8589..ed79b505 100644 Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.7.bytes and b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.7.bytes rename to wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.54.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.55.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.54.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.55.bytes index 4f8c81a2..6c847c04 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.54.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.55.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.55.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.56.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.55.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.56.bytes index 47877f6b..926a03f1 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.55.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.56.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.71.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.72.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.71.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.72.bytes index ef98c7e9..8d49854a 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.71.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.72.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.68.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.69.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.68.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.69.bytes index 9d356f32..7d8268d2 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.68.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.69.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.49.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.50.bytes similarity index 93% rename from wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.49.bytes rename to wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.50.bytes index 36b3d9b2..d2465661 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.49.bytes and b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.50.bytes differ