diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index 42682740..5f1d31d2 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -182,7 +182,9 @@ function M:SendInteraction(playid, type, parm, callback) _data['playerid'] = playid _data['type'] = type _data['parm'] = parm - _client:send(Protocol.GAME_INTERACTION, _data) + _client:send(Protocol.GAME_INTERACTION, _data, function(res) + callback(res) + end) end --请求离开房间 diff --git a/lua_probject/base_project/Game/IGameInfo.lua b/lua_probject/base_project/Game/IGameInfo.lua index b7ac7f12..b1c2d1bf 100644 --- a/lua_probject/base_project/Game/IGameInfo.lua +++ b/lua_probject/base_project/Game/IGameInfo.lua @@ -68,4 +68,15 @@ function M:ShowVariablePrice(ctype) -- tex_owner.text = price end +function M:LoadConfigToDetail(data) + + local returnString = '' + + local configData = json.decode(data) + + pt(configData) + + return returnString +end + return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua index c80a742a..4151c2d1 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua @@ -65,10 +65,10 @@ function M:FillData() --print("lingmeng FillData", self.groupid, self.pid, self.invite_id, type(self.invite_id), type(self.groupid),player) --pt(group.memberMap) - self._viewText_groupName.text = Utils.TextOmit(group.name, 6) + self._viewText_groupName.text = Utils.TextOmit(group.name, 6, "...") self._viewText_gameName.text = play.game_name self._viewText_inviteName.text = player.nick - self._viewText_playName.text = Utils.TextOmit(play.name, 6) + self._viewText_playName.text = Utils.TextOmit(play.name, 6, "...") local config = ExtendManager.GetExtendConfig(play.gameId) local mode = config:GetGameInfo() diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua index e98659ee..01ba4e32 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua @@ -142,12 +142,12 @@ function FamilyMyFamily:Refalsh() self.family = DataManager.groups.groupMap[self.groupId] - self.tex_fName.text = Utils.TextOmit(self.family.name, 6) + self.tex_fName.text = Utils.TextOmit(self.family.name, 6, "...") self.tex_playerName.text = "亲友圈号:" .. self.family.id self.tex_fNumber.text = self.family.member_num self.tex_cradNum.text = self.family.diamo self.tex_nocice.text = self.family.notice - self.tex_wxId.text = Utils.TextOmit(self.family.wechatId, 6) + self.tex_wxId.text = Utils.TextOmit(self.family.wechatId, 6, "...") ImageLoad.Load(self.family.o_portrait, self.loader_icon) self.cStyle.selectedIndex = self.family.lev - 1 diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua b/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua index 76232119..52279ba1 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua @@ -105,7 +105,7 @@ function FamilyMyfamilyList:Init() tex_familyId.text = group.id tex_familyName.emojies = EmojiDitc.EmojiesDitc - tex_familyName.text = Utils.TextOmit(group.name, 6) + tex_familyName.text = Utils.TextOmit(group.name, 6, "...") tex_familyNumber.text = group.total_member_num ImageLoad.Load(group.o_portrait, loader_icon) diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index 4749962f..e87a673e 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -54,7 +54,7 @@ function FamilyNumberRecord.New(root, page) self.ctr_numberRecord = self._view:GetController('page') self._cte_noPeople = self._view:GetController('noPeople') - local groupName = Utils.TextOmit(root._group.name, 6) + local groupName = Utils.TextOmit(root._group.name, 6, "...") self._text_groupTitle = string.format("%s(%s)", groupName, group_id) diff --git a/lua_probject/base_project/Game/View/Family/PlayEditView.lua b/lua_probject/base_project/Game/View/Family/PlayEditView.lua index 337607a1..0ebf28f5 100644 --- a/lua_probject/base_project/Game/View/Family/PlayEditView.lua +++ b/lua_probject/base_project/Game/View/Family/PlayEditView.lua @@ -76,7 +76,7 @@ function PlayEditView:Init() local times = json.decode(playList[index].hpData).times obj:GetChild('Label_details'):GetChild('title').text = times / 1000 .. "倍," .. mode:LoadConfigToDetail(playList[index].config) obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc - obj:GetChild('text_playName').text = Utils.TextOmit(playList[index].name, 6) + obj:GetChild('text_playName').text = Utils.TextOmit(playList[index].name, 6, "...") obj:GetController('type').selectedIndex = 1 obj:GetChild('btn_del').onClick:Set(function() ViewUtil.ShowTwoChooose("是否要删除该玩法", function() diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index baaa1e60..6c2f92fe 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -480,7 +480,7 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type) list_familyNumber.itemRenderer = function(index, obj) local player = self.members[index + 1] obj:GetChild('title').emojies = EmojiDitc.EmojiesDitc - obj:GetChild('title').text = Utils.TextOmit(player.nick, 5) + obj:GetChild('title').text = Utils.TextOmit(player.nick, 5, "...") obj:GetController('type').selectedIndex = player.online and player.online or 0 if player.playing == "startPlaying" then obj:GetController('type').selectedIndex = 2 @@ -580,7 +580,7 @@ function M:UpdateFamilyRoom(fgCtr, id) gamePlay = times / 1000 .. "倍," .. gamePlay obj:GetChild('Label_gameRule').title = gamePlay local roomName = playGameInfoTable[roomList[newIndex].pid].name - roomName = Utils.TextOmit(roomName, 6) + roomName = Utils.TextOmit(roomName, 6, "") obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc obj:GetChild('game_type').text = string.format("（%s）%s", playGameInfoTable[roomList[newIndex].pid].gameName, roomName, @@ -659,8 +659,9 @@ function M:UpdateFamilyRoom(fgCtr, id) local gamePlay = times / 1000 .. "倍," gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config) obj:GetChild('Label_gameRule').title = gamePlay - local roomName = Utils.TextOmit(playList[newIndex].name, 6) + local roomName = Utils.TextOmit(playList[newIndex].name, 6, "") roomName = string.format("（%s）%s", playList[newIndex].game_name, roomName) + obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc obj:GetChild('game_type').text = roomName obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0 obj:GetController('type').selectedIndex = 0 @@ -791,7 +792,7 @@ function M:ConnetFamily(index, groups, isCreate) local j = i + 1 local group = DataManager.groups.groupList[j] obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc - obj.text = Utils.TextOmit(group.name, 6) + obj.text = Utils.TextOmit(group.name, 6, "...") obj.onClick:Add(function() if group.id == self._group.id then ViewUtil.ShowBannerOnScreenCenter("已在家族中") diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index bf56031b..4a20c56f 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -188,7 +188,7 @@ function M:InitView(url) end) view:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc - view:GetChild("tex_name").text = Utils.TextOmit(DataManager.SelfUser.nick_name, 6) + view:GetChild("tex_name").text = Utils.TextOmit(DataManager.SelfUser.nick_name, 6, "...") view:GetChild("tex_id").text = tostring(DataManager.SelfUser.account_id) view:GetChild("btn_diamo").text = tostring(DataManager.SelfUser.diamo) diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 9b447788..b4163c17 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -786,11 +786,12 @@ function M:EventInit() function(...) local arg = { ... } local data = arg[1] - local _type = arg[2].type + local _type = arg[2] if _type == "Missile" then - local sendSeat = arg[2].sendSeat - local targetSeat = arg[2].targetSeat - self:Missile(sendSeat, targetSeat, arg[3]) + local sendSeat = arg[3].sendSeat + local targetSeat = arg[3].targetSeat + local Missile = arg[3].Missile + self:Missile(sendSeat, targetSeat, Missile) end local p = arg[1] diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 91997c3f..108db03b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -971,7 +971,7 @@ function M:InitView(url) self._view:GetChild('tex_id').text = "ID:" .. self.curGroup.id - self._view:GetChild('tex_name').text = Utils.TextOmit(self.curGroup.name, 6) + self._view:GetChild('tex_name').text = Utils.TextOmit(self.curGroup.name, 6, "...") -- self._view:GetChild('tex_p_name').text = ViewUtil.stringEllipsis(DataManager.SelfUser.nick_name) @@ -1931,7 +1931,7 @@ function M:__refreshPay() end -- self._view:GetChild("tex_name").text = __getLayerName(self,0) - self._view:GetChild('tex_name').text = Utils.TextOmit(self.curGroup.name, 6) + self._view:GetChild('tex_name').text = Utils.TextOmit(self.curGroup.name, 6, "...") end end diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua index 0d77c0bb..2d4b2b7b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua @@ -158,7 +158,7 @@ end function M:__fill_item(item, group) item:GetChild('tex_name').emojies = EmojiDitc.EmojiesDitc - item:GetChild('tex_name').text = Utils.TextOmit(group.name, 6) + item:GetChild('tex_name').text = Utils.TextOmit(group.name, 6, "...") item:GetChild('tex_id').text = "ID:" .. group.id local p_num = group.total_member_num item:GetChild('tex_p_num').text = p_num > 99 and '99+' or p_num diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupSettingView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupSettingView.lua index 46c1a3ae..70f8a574 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupSettingView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupSettingView.lua @@ -89,7 +89,7 @@ function M:FillData() local group = groups[i] local item = lst_group:AddItemFromPool() item:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc - item:GetChild("tex_name").text = Utils.TextOmit(group.name, 6) + item:GetChild("tex_name").text = Utils.TextOmit(group.name, 6, "...") item:GetChild("tex_id").text = group.id item:GetChild("tex_nick").text ="创建人：" .. group.o_nick item.data = group diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua index b85f4bd9..f32a57cb 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua @@ -50,6 +50,8 @@ function M:init(url) self.btn_changeTimes = self._view:GetChild("btn_changeTimes") self.btn_closeTimesPage = self._view:GetChild("btn_closeTimesPage") + self._view:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc + self.cTimesPage = self._view:GetController("cTimesPage") self.SliderTimes = self._view:GetChild("SliderTimes") @@ -86,7 +88,7 @@ function M:init(url) self.btn_changeTimes.onClick:Set(function() if self.cTimesPage.selectedIndex == 0 then self.cTimesPage.selectedIndex = 1 - else + else self.cTimesPage.selectedIndex = 0 end end) @@ -96,7 +98,13 @@ function M:init(url) end) self.SliderTimes.onChanged:Set(function() - self.tex_times.text = math.ceil(self.SliderTimes.value) + local num = math.ceil(self.SliderTimes.value) + + if num == 0 then + num = 1 + end + + self.tex_times.text = num end) self:FillGameData() @@ -134,7 +142,7 @@ function M:FillGameData() -- 玩法名 if self.play then local tex_name = self._view:GetChild("tex_name") - tex_name.text = self.play.name + tex_name.text = Utils.TextOmit(self.play.name, 6, "...") self._view:GetChild("tex_times").text = self.play.hp_times / 1000 self.SliderTimes.value = self.play.hp_times / 1000 end @@ -869,10 +877,20 @@ function M:FillFagData_jiangxi() local cGongneng = com_editSetting:GetController("cGongneng") local cChat = com_editSetting:GetController("cChat") local cMisslie = com_editSetting:GetController("cMisslie") + -- GPS设置 self.hpData.gps = cGps.selectedIndex + 1 -- 托管 - self.hpData.TuoGuan = cTuoguan.selectedIndex + 1 + local time = 0 + if cTuoguan.selectedIndex == 1 then + time = 30 + elseif cTuoguan.selectedIndex == 2 then + time = 60 + elseif cTuoguan.selectedIndex == 3 then + time = 120 + end + _data.tuoguan_active_time = time + -- 解散 self.hpData.JieShan = cJiesan.selectedIndex + 1 -- 功能 diff --git a/lua_probject/base_project/Game/View/playerDetailView.lua b/lua_probject/base_project/Game/View/playerDetailView.lua index 2ad53cdf..8b298027 100644 --- a/lua_probject/base_project/Game/View/playerDetailView.lua +++ b/lua_probject/base_project/Game/View/playerDetailView.lua @@ -1,12 +1,13 @@ local playerDetailView = {} local function Send(self, Missile) + local _type = "Missile" local _data = {} _data.sendSeat = DataManager.CurrenRoom.self_player.seat --DataManager.SelfUser.account_id _data.targetSeat = self.player.seat - _data.type = "Missile" + _data.Missile = Missile local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendInteraction(DataManager.SelfUser.account_id, _data, Missile) + _gamectr:SendInteraction(DataManager.SelfUser.account_id, _type, _data) end function playerDetailView.New() diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua index 596937d3..67e59272 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua @@ -201,6 +201,9 @@ function M:LoadConfigToDetail(data) if configData.zuangfenfanbei then returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",庄家积分翻倍" or "") end + + returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data) + return returnString end diff --git a/wb_new_ui/assets/Extend_MJ_JinXi/package.xml b/wb_new_ui/assets/Extend_MJ_JinXi/package.xml index e32cfe6a..a054e5fd 100644 --- a/wb_new_ui/assets/Extend_MJ_JinXi/package.xml +++ b/wb_new_ui/assets/Extend_MJ_JinXi/package.xml @@ -212,6 +212,22 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml b/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml index cb506e02..40b652f9 100644 --- a/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml +++ b/wb_new_ui/assets/Extend_MJ_LiChuan/package.xml @@ -208,6 +208,26 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml b/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml index f039beaa..ffe711a5 100644 --- a/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml +++ b/wb_new_ui/assets/Extend_MJ_NanCheng/package.xml @@ -216,6 +216,22 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml index 8522318c..65b66e29 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml @@ -509,6 +509,22 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 6f2dcd78..567d0b0f 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -105,7 +105,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml b/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml index ec8a23d7..558ad1de 100644 --- a/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml +++ b/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml b/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml index 68ab9579..ff86c73a 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_familyName.xml @@ -8,7 +8,7 @@ - + diff --git a/wb_new_ui/assets/Family/Main/Component/btn_head.xml b/wb_new_ui/assets/Family/Main/Component/btn_head.xml index fa14ac70..cc77ac00 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_head.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_head.xml @@ -2,7 +2,7 @@ - + diff --git a/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml b/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml index f94bf61b..fa716379 100644 --- a/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml +++ b/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml @@ -1,18 +1,18 @@ - + - - + + - + + + + - + - - - \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml index 5a72bf5b..c1c1a567 100644 --- a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml +++ b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml @@ -28,19 +28,19 @@ - + - - + + - - + diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index 70229489..b3a42afe 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -394,6 +394,10 @@ + + + + \ No newline at end of file diff --git a/wb_unity_pro/--ProjectSettings/--GraphicsSettings.asset b/wb_unity_pro/--ProjectSettings/--GraphicsSettings.asset deleted file mode 100644 index 4f4dac17..00000000 --- a/wb_unity_pro/--ProjectSettings/--GraphicsSettings.asset +++ /dev/null @@ -1,66 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!30 &1 -GraphicsSettings: - m_ObjectHideFlags: 0 - serializedVersion: 13 - m_Deferred: - m_Mode: 1 - m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} - m_ScreenSpaceShadows: - m_Mode: 1 - m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} - m_DepthNormals: - m_Mode: 1 - m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} - m_MotionVectors: - m_Mode: 1 - m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} - m_LightHalo: - m_Mode: 1 - m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} - m_LensFlare: - m_Mode: 1 - m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 0} - m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} - m_DefaultRenderingPath: 1 - m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] - m_LightmapStripping: 0 - m_FogStripping: 0 - m_InstancingStripping: 0 - m_LightmapKeepPlain: 1 - m_LightmapKeepDirCombined: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepShadowMask: 1 - m_LightmapKeepSubtractive: 1 - m_FogKeepLinear: 1 - m_FogKeepExp: 1 - m_FogKeepExp2: 1 - m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 - m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/wb_unity_pro/--ProjectSettings/AudioManager.asset b/wb_unity_pro/--ProjectSettings/AudioManager.asset deleted file mode 100644 index 2c4f5a1b..00000000 --- a/wb_unity_pro/--ProjectSettings/AudioManager.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!11 &1 -AudioManager: - m_ObjectHideFlags: 0 - m_Volume: 1 - Rolloff Scale: 1 - Doppler Factor: 1 - Default Speaker Mode: 2 - m_SampleRate: 0 - m_DSPBufferSize: 0 - m_VirtualVoiceCount: 512 - m_RealVoiceCount: 32 - m_SpatializerPlugin: - m_DisableAudio: 0 - m_VirtualizeEffects: 1 diff --git a/wb_unity_pro/--ProjectSettings/ClusterInputManager.asset b/wb_unity_pro/--ProjectSettings/ClusterInputManager.asset deleted file mode 100644 index e7886b26..00000000 --- a/wb_unity_pro/--ProjectSettings/ClusterInputManager.asset +++ /dev/null @@ -1,6 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!236 &1 -ClusterInputManager: - m_ObjectHideFlags: 0 - m_Inputs: [] diff --git a/wb_unity_pro/--ProjectSettings/DynamicsManager.asset b/wb_unity_pro/--ProjectSettings/DynamicsManager.asset deleted file mode 100644 index 3534236e..00000000 --- a/wb_unity_pro/--ProjectSettings/DynamicsManager.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!55 &1 -PhysicsManager: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Gravity: {x: 0, y: -9.81, z: 0} - m_DefaultMaterial: {fileID: 0} - m_BounceThreshold: 2 - m_SleepThreshold: 0.005 - m_DefaultContactOffset: 0.01 - m_SolverIterationCount: 6 - m_QueriesHitTriggers: 1 - m_EnableAdaptiveForce: 0 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/wb_unity_pro/--ProjectSettings/EditorBuildSettings.asset b/wb_unity_pro/--ProjectSettings/EditorBuildSettings.asset deleted file mode 100644 index 6c30e0b3..00000000 --- a/wb_unity_pro/--ProjectSettings/EditorBuildSettings.asset +++ /dev/null @@ -1,9 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1045 &1 -EditorBuildSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Scenes: - - enabled: 1 - path: Assets/start.unity diff --git a/wb_unity_pro/--ProjectSettings/EditorSettings.asset b/wb_unity_pro/--ProjectSettings/EditorSettings.asset deleted file mode 100644 index 8154aabe..00000000 --- a/wb_unity_pro/--ProjectSettings/EditorSettings.asset +++ /dev/null @@ -1,35 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!159 &1 -EditorSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_ExternalVersionControlSupport: Hidden Meta Files - m_SerializationMode: 2 - m_LineEndingsForNewScripts: 1 - m_DefaultBehaviorMode: 0 - m_PrefabRegularEnvironment: {fileID: 0} - m_PrefabUIEnvironment: {fileID: 0} - m_SpritePackerMode: 2 - m_SpritePackerPaddingPower: 1 - m_EtcTextureCompressorBehavior: 0 - m_EtcTextureFastCompressor: 2 - m_EtcTextureNormalCompressor: 2 - m_EtcTextureBestCompressor: 5 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref - m_ProjectGenerationRootNamespace: - m_CollabEditorSettings: - inProgressEnabled: 1 - m_EnableTextureStreamingInEditMode: 1 - m_EnableTextureStreamingInPlayMode: 1 - m_AsyncShaderCompilation: 1 - m_EnterPlayModeOptionsEnabled: 0 - m_EnterPlayModeOptions: 3 - m_ShowLightmapResolutionOverlay: 1 - m_UseLegacyProbeSampleCount: 1 - m_AssetPipelineMode: 1 - m_CacheServerMode: 0 - m_CacheServerEndpoint: - m_CacheServerNamespacePrefix: default - m_CacheServerEnableDownload: 1 - m_CacheServerEnableUpload: 1 diff --git a/wb_unity_pro/--ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/--ProjectSettings/GraphicsSettings.asset deleted file mode 100644 index 617c0aa4..00000000 Binary files a/wb_unity_pro/--ProjectSettings/GraphicsSettings.asset and /dev/null differ diff --git a/wb_unity_pro/--ProjectSettings/InputManager.asset b/wb_unity_pro/--ProjectSettings/InputManager.asset deleted file mode 100644 index 17c8f538..00000000 --- a/wb_unity_pro/--ProjectSettings/InputManager.asset +++ /dev/null @@ -1,295 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!13 &1 -InputManager: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Axes: - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: a - altPositiveButton: d - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: s - altPositiveButton: w - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse X - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 2 - joyNum: 0 - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 1 - type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 diff --git a/wb_unity_pro/--ProjectSettings/NavMeshAreas.asset b/wb_unity_pro/--ProjectSettings/NavMeshAreas.asset deleted file mode 100644 index a04f35c7..00000000 --- a/wb_unity_pro/--ProjectSettings/NavMeshAreas.asset +++ /dev/null @@ -1,71 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!126 &1 -NavMeshAreas: - m_ObjectHideFlags: 0 - serializedVersion: 2 - areas: - - name: Walkable - cost: 1 - - name: Not Walkable - cost: 1 - - name: Jump - cost: 2 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 diff --git a/wb_unity_pro/--ProjectSettings/NavMeshLayers.asset b/wb_unity_pro/--ProjectSettings/NavMeshLayers.asset deleted file mode 100644 index 5fc3f29a..00000000 Binary files a/wb_unity_pro/--ProjectSettings/NavMeshLayers.asset and /dev/null differ diff --git a/wb_unity_pro/--ProjectSettings/NetworkManager.asset b/wb_unity_pro/--ProjectSettings/NetworkManager.asset deleted file mode 100644 index 5dc6a831..00000000 --- a/wb_unity_pro/--ProjectSettings/NetworkManager.asset +++ /dev/null @@ -1,8 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!149 &1 -NetworkManager: - m_ObjectHideFlags: 0 - m_DebugLevel: 0 - m_Sendrate: 15 - m_AssetToPrefab: {} diff --git a/wb_unity_pro/--ProjectSettings/Physics2DSettings.asset b/wb_unity_pro/--ProjectSettings/Physics2DSettings.asset deleted file mode 100644 index 7e9e664f..00000000 --- a/wb_unity_pro/--ProjectSettings/Physics2DSettings.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!19 &1 -Physics2DSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Gravity: {x: 0, y: -9.81} - m_DefaultMaterial: {fileID: 0} - m_VelocityIterations: 8 - m_PositionIterations: 3 - m_VelocityThreshold: 1 - m_MaxLinearCorrection: 0.2 - m_MaxAngularCorrection: 8 - m_MaxTranslationSpeed: 100 - m_MaxRotationSpeed: 360 - m_MinPenetrationForPenalty: 0.01 - m_BaumgarteScale: 0.2 - m_BaumgarteTimeOfImpactScale: 0.75 - m_TimeToSleep: 0.5 - m_LinearSleepTolerance: 0.01 - m_AngularSleepTolerance: 2 - m_QueriesHitTriggers: 1 - m_QueriesStartInColliders: 1 - m_ChangeStopsCallbacks: 0 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/wb_unity_pro/--ProjectSettings/PresetManager.asset b/wb_unity_pro/--ProjectSettings/PresetManager.asset deleted file mode 100644 index 636a595b..00000000 --- a/wb_unity_pro/--ProjectSettings/PresetManager.asset +++ /dev/null @@ -1,6 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1386491679 &1 -PresetManager: - m_ObjectHideFlags: 0 - m_DefaultList: [] diff --git a/wb_unity_pro/--ProjectSettings/ProjectSettings.asset b/wb_unity_pro/--ProjectSettings/ProjectSettings.asset deleted file mode 100644 index fd2f0474..00000000 --- a/wb_unity_pro/--ProjectSettings/ProjectSettings.asset +++ /dev/null @@ -1,883 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!129 &1 -PlayerSettings: - m_ObjectHideFlags: 0 - serializedVersion: 20 - productGUID: e1a65d9d6ea2df349816f24ffdb49f72 - AndroidProfiler: 0 - AndroidFilterTouchesWhenObscured: 0 - AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 - targetDevice: 2 - useOnDemandResources: 0 - accelerometerFrequency: 60 - companyName: qyhy - productName: "\u68CB\u6E90\u4E92\u5A31" - defaultCursor: {fileID: 0} - cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} - m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 - m_SplashScreenOverlayOpacity: 0 - m_SplashScreenAnimation: 2 - m_SplashScreenLogoStyle: 1 - m_SplashScreenDrawMode: 0 - m_SplashScreenBackgroundAnimationZoom: 0 - m_SplashScreenLogoAnimationZoom: 0 - m_SplashScreenBackgroundLandscapeAspect: 1 - m_SplashScreenBackgroundPortraitAspect: 1 - m_SplashScreenBackgroundLandscapeUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenBackgroundPortraitUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenLogos: - - logo: {fileID: 0} - duration: 2 - m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 560 - defaultScreenHeight: 315 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 - m_StereoRenderingPath: 0 - m_ActiveColorSpace: 0 - m_MTRendering: 1 - m_StackTraceTypes: 010000000100000001000000010000000100000001000000 - iosShowActivityIndicatorOnLoading: -1 - androidShowActivityIndicatorOnLoading: -1 - iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 - allowedAutorotateToPortrait: 0 - allowedAutorotateToPortraitUpsideDown: 0 - allowedAutorotateToLandscapeRight: 1 - allowedAutorotateToLandscapeLeft: 1 - useOSAutorotation: 1 - use32BitDisplayBuffer: 1 - preserveFramebufferAlpha: 0 - disableDepthAndStencilBuffers: 0 - androidStartInFullscreen: 1 - androidRenderOutsideSafeArea: 1 - androidUseSwappy: 0 - androidBlitType: 0 - defaultIsNativeResolution: 1 - macRetinaSupport: 1 - runInBackground: 1 - captureSingleScreen: 0 - muteOtherAudioSources: 0 - Prepare IOS For Recording: 0 - Force IOS Speakers When Recording: 0 - deferSystemGesturesMode: 0 - hideHomeButton: 0 - submitAnalytics: 1 - usePlayerLog: 1 - bakeCollisionMeshes: 0 - forceSingleInstance: 0 - useFlipModelSwapchain: 1 - resizableWindow: 1 - useMacAppStoreValidation: 0 - macAppStoreCategory: public.app-category.games - gpuSkinning: 0 - xboxPIXTextureCapture: 0 - xboxEnableAvatar: 0 - xboxEnableKinect: 0 - xboxEnableKinectAutoTracking: 0 - xboxEnableFitness: 0 - visibleInBackground: 0 - allowFullscreenSwitch: 1 - fullscreenMode: 0 - xboxSpeechDB: 0 - xboxEnableHeadOrientation: 0 - xboxEnableGuest: 0 - xboxEnablePIXSampling: 0 - metalFramebufferOnly: 0 - xboxOneResolution: 0 - xboxOneSResolution: 0 - xboxOneXResolution: 3 - xboxOneMonoLoggingLevel: 0 - xboxOneLoggingLevel: 1 - xboxOneDisableEsram: 0 - xboxOneEnableTypeOptimization: 0 - xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 1048576 - switchQueueControlMemory: 16384 - switchQueueComputeMemory: 262144 - switchNVNShaderPoolsGranularity: 33554432 - switchNVNDefaultPoolsGranularity: 16777216 - switchNVNOtherPoolsGranularity: 16777216 - switchNVNMaxPublicTextureIDCount: 0 - switchNVNMaxPublicSamplerIDCount: 0 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 - vulkanNumSwapchainBuffers: 3 - vulkanEnableSetSRGBWrite: 0 - vulkanEnableLateAcquireNextImage: 0 - m_SupportedAspectRatios: - 4:3: 0 - 5:4: 0 - 16:10: 0 - 16:9: 1 - Others: 0 - bundleVersion: 1.0.2 - preloadedAssets: [] - metroInputSource: 0 - wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 - vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 - enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 - enableFrameTimingStats: 0 - useHDRDisplay: 0 - D3DHDRBitDepth: 0 - m_ColorGamuts: 00000000 - targetPixelDensity: 30 - resolutionScalingMode: 0 - androidSupportedAspectRatio: 1 - androidMaxAspectRatio: 2.1 - applicationIdentifier: - Android: com.jxgame.qyhy - Standalone: unity.dy.qp0101 - Tizen: com.dangdanggame.csyx5 - iPhone: com.lbgame.sanmu - tvOS: com.dangdanggame.csyx5 - buildNumber: - iPhone: 1 - AndroidBundleVersionCode: 12 - AndroidMinSdkVersion: 22 - AndroidTargetSdkVersion: 26 - AndroidPreferredInstallLocation: 1 - aotOptions: - stripEngineCode: 0 - iPhoneStrippingLevel: 1 - iPhoneScriptCallOptimization: 0 - ForceInternetPermission: 0 - ForceSDCardPermission: 1 - CreateWallpaper: 0 - APKExpansionFiles: 0 - keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: 214 - iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 - tvOSSdkVersion: 0 - tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 - uIPrerenderedIcon: 0 - uIRequiresPersistentWiFi: 0 - uIRequiresFullScreen: 1 - uIStatusBarHidden: 1 - uIExitOnSuspend: 0 - uIStatusBarStyle: 0 - appleTVSplashScreen: {fileID: 0} - appleTVSplashScreen2x: {fileID: 0} - tvOSSmallIconLayers: [] - tvOSSmallIconLayers2x: [] - tvOSLargeIconLayers: [] - tvOSLargeIconLayers2x: [] - tvOSTopShelfImageLayers: [] - tvOSTopShelfImageLayers2x: [] - tvOSTopShelfImageWideLayers: [] - tvOSTopShelfImageWideLayers2x: [] - iOSLaunchScreenType: 0 - iOSLaunchScreenPortrait: {fileID: 0} - iOSLaunchScreenLandscape: {fileID: 0} - iOSLaunchScreenBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreenFillPct: 100 - iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: - iOSLaunchScreeniPadType: 0 - iOSLaunchScreeniPadImage: {fileID: 0} - iOSLaunchScreeniPadBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreeniPadFillPct: 100 - iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 - iOSLaunchScreenCustomStoryboardPath: - iOSDeviceRequirements: [] - iOSURLSchemes: [] - iOSBackgroundModes: 0 - iOSMetalForceHardShadows: 0 - metalEditorSupport: 1 - metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 1 - appleDeveloperTeamID: lib - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: - iOSManualSigningProvisioningProfileType: 0 - tvOSManualSigningProvisioningProfileType: 0 - appleEnableAutomaticSigning: 1 - iOSRequireARKit: 0 - iOSAutomaticallyDetectAndAddCapabilities: 1 - appleEnableProMotion: 0 - clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: - AndroidTargetArchitectures: 1 - AndroidSplashScreenScale: 2 - androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: smn.keystore' - AndroidKeyaliasName: smn - AndroidBuildApkPerCpuArchitecture: 0 - AndroidTVCompatibility: 1 - AndroidIsGame: 1 - AndroidEnableTango: 0 - androidEnableBanner: 0 - androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 1 - m_AndroidBanners: - - width: 320 - height: 180 - banner: {fileID: 0} - androidGamepadSupportLevel: 1 - AndroidValidateAppBundleSize: 1 - AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: - - m_BuildTarget: - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: 0c96432335c56464db3c605e4582334f, type: 3} - m_Width: 128 - m_Height: 128 - m_Kind: 0 - m_BuildTargetPlatformIcons: - - m_BuildTarget: Android - m_Icons: - - m_Textures: - - {fileID: 0} - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 144 - m_Height: 144 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 96 - m_Height: 96 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 72 - m_Height: 72 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 48 - m_Height: 48 - m_Kind: 1 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 36 - m_Height: 36 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 432 - m_Height: 432 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 324 - m_Height: 324 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 216 - m_Height: 216 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 162 - m_Height: 162 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 108 - m_Height: 108 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 81 - m_Height: 81 - m_Kind: 2 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 192 - m_Height: 192 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 144 - m_Height: 144 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 96 - m_Height: 96 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 72 - m_Height: 72 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 48 - m_Height: 48 - m_Kind: 0 - m_SubKind: - - m_Textures: - - {fileID: 0} - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: - - m_BuildTarget: iPhone - m_Icons: - - m_Textures: [] - m_Width: 180 - m_Height: 180 - m_Kind: 0 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 120 - m_Height: 120 - m_Kind: 0 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 167 - m_Height: 167 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 152 - m_Height: 152 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 76 - m_Height: 76 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 120 - m_Height: 120 - m_Kind: 3 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 80 - m_Height: 80 - m_Kind: 3 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 80 - m_Height: 80 - m_Kind: 3 - m_SubKind: iPad - - m_Textures: [] - m_Width: 40 - m_Height: 40 - m_Kind: 3 - m_SubKind: iPad - - m_Textures: [] - m_Width: 87 - m_Height: 87 - m_Kind: 1 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 58 - m_Height: 58 - m_Kind: 1 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 29 - m_Height: 29 - m_Kind: 1 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 58 - m_Height: 58 - m_Kind: 1 - m_SubKind: iPad - - m_Textures: [] - m_Width: 29 - m_Height: 29 - m_Kind: 1 - m_SubKind: iPad - - m_Textures: [] - m_Width: 60 - m_Height: 60 - m_Kind: 2 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 40 - m_Height: 40 - m_Kind: 2 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 40 - m_Height: 40 - m_Kind: 2 - m_SubKind: iPad - - m_Textures: [] - m_Width: 20 - m_Height: 20 - m_Kind: 2 - m_SubKind: iPad - - m_Textures: [] - m_Width: 1024 - m_Height: 1024 - m_Kind: 4 - m_SubKind: App Store - m_BuildTargetBatching: - - m_BuildTarget: Android - m_StaticBatching: 1 - m_DynamicBatching: 1 - m_BuildTargetGraphicsJobs: - - m_BuildTarget: MacStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: Switch - m_GraphicsJobs: 0 - - m_BuildTarget: MetroSupport - m_GraphicsJobs: 0 - - m_BuildTarget: AppleTVSupport - m_GraphicsJobs: 0 - - m_BuildTarget: BJMSupport - m_GraphicsJobs: 0 - - m_BuildTarget: LinuxStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: PS4Player - m_GraphicsJobs: 0 - - m_BuildTarget: iOSSupport - m_GraphicsJobs: 0 - - m_BuildTarget: WindowsStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: XboxOnePlayer - m_GraphicsJobs: 0 - - m_BuildTarget: LuminSupport - m_GraphicsJobs: 0 - - m_BuildTarget: CloudRendering - m_GraphicsJobs: 0 - - m_BuildTarget: AndroidPlayer - m_GraphicsJobs: 0 - - m_BuildTarget: WebGLSupport - m_GraphicsJobs: 0 - m_BuildTargetGraphicsJobMode: - - m_BuildTarget: PS4Player - m_GraphicsJobMode: 0 - - m_BuildTarget: XboxOnePlayer - m_GraphicsJobMode: 0 - m_BuildTargetGraphicsAPIs: - - m_BuildTarget: AndroidPlayer - m_APIs: 080000000b000000 - m_Automatic: 1 - - m_BuildTarget: WindowsStandaloneSupport - m_APIs: 02000000 - m_Automatic: 0 - m_BuildTargetVRSettings: - - m_BuildTarget: Android - m_Enabled: 0 - m_Devices: - - Oculus - openGLRequireES31: 0 - openGLRequireES31AEP: 0 - openGLRequireES32: 0 - m_TemplateCustomTags: {} - mobileMTRendering: - Android: 1 - iPhone: 1 - tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 1 - - m_BuildTarget: XboxOne - m_EncodingQuality: 1 - - m_BuildTarget: PS4 - m_EncodingQuality: 1 - m_BuildTargetGroupLightmapSettings: [] - playModeTestRunnerEnabled: 0 - runPlayModeTestAsEditModeTest: 0 - actionOnDotNetUnhandledException: 1 - enableInternalProfiler: 0 - logObjCUncaughtExceptions: 1 - enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - switchNetLibKey: - switchSocketMemoryPoolSize: 6144 - switchSocketAllocatorPoolSize: 128 - switchSocketConcurrencyLimit: 14 - switchScreenResolutionBehavior: 2 - switchUseCPUProfiler: 0 - switchApplicationID: 0x01004b9000490000 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: - switchIcons_0: {fileID: 0} - switchIcons_1: {fileID: 0} - switchIcons_2: {fileID: 0} - switchIcons_3: {fileID: 0} - switchIcons_4: {fileID: 0} - switchIcons_5: {fileID: 0} - switchIcons_6: {fileID: 0} - switchIcons_7: {fileID: 0} - switchIcons_8: {fileID: 0} - switchIcons_9: {fileID: 0} - switchIcons_10: {fileID: 0} - switchIcons_11: {fileID: 0} - switchIcons_12: {fileID: 0} - switchIcons_13: {fileID: 0} - switchIcons_14: {fileID: 0} - switchSmallIcons_0: {fileID: 0} - switchSmallIcons_1: {fileID: 0} - switchSmallIcons_2: {fileID: 0} - switchSmallIcons_3: {fileID: 0} - switchSmallIcons_4: {fileID: 0} - switchSmallIcons_5: {fileID: 0} - switchSmallIcons_6: {fileID: 0} - switchSmallIcons_7: {fileID: 0} - switchSmallIcons_8: {fileID: 0} - switchSmallIcons_9: {fileID: 0} - switchSmallIcons_10: {fileID: 0} - switchSmallIcons_11: {fileID: 0} - switchSmallIcons_12: {fileID: 0} - switchSmallIcons_13: {fileID: 0} - switchSmallIcons_14: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: - switchMainThreadStackSize: 1048576 - switchPresenceGroupId: - switchLogoHandling: 0 - switchReleaseVersion: 0 - switchDisplayVersion: 1.0.0 - switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 - switchSupportedLanguagesMask: 0 - switchLogoType: 0 - switchApplicationErrorCodeCategory: - switchUserAccountSaveDataSize: 0 - switchUserAccountSaveDataJournalSize: 0 - switchApplicationAttribute: 0 - switchCardSpecSize: -1 - switchCardSpecClock: -1 - switchRatingsMask: 0 - switchRatingsInt_0: 0 - switchRatingsInt_1: 0 - switchRatingsInt_2: 0 - switchRatingsInt_3: 0 - switchRatingsInt_4: 0 - switchRatingsInt_5: 0 - switchRatingsInt_6: 0 - switchRatingsInt_7: 0 - switchRatingsInt_8: 0 - switchRatingsInt_9: 0 - switchRatingsInt_10: 0 - switchRatingsInt_11: 0 - switchRatingsInt_12: 0 - switchLocalCommunicationIds_0: - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: - switchParentalControl: 0 - switchAllowsScreenshot: 1 - switchAllowsVideoCapturing: 1 - switchAllowsRuntimeAddOnContentInstall: 0 - switchDataLossConfirmation: 0 - switchUserAccountLockEnabled: 0 - switchSystemResourceMemory: 16777216 - switchSupportedNpadStyles: 3 - switchNativeFsCacheSize: 32 - switchIsHoldTypeHorizontal: 0 - switchSupportedNpadCount: 8 - switchSocketConfigEnabled: 0 - switchTcpInitialSendBufferSize: 32 - switchTcpInitialReceiveBufferSize: 64 - switchTcpAutoSendBufferSizeMax: 256 - switchTcpAutoReceiveBufferSizeMax: 256 - switchUdpSendBufferSize: 9 - switchUdpReceiveBufferSize: 42 - switchSocketBufferEfficiency: 4 - switchSocketInitializeEnabled: 1 - switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 - ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: - ps4ParentalLevel: 1 - ps4ContentID: ED1633-NPXX51362_00-0000000000000000 - ps4Category: 0 - ps4MasterVersion: 01.00 - ps4AppVersion: 01.00 - ps4AppType: 0 - ps4ParamSfxPath: - ps4VideoOutPixelFormat: 0 - ps4VideoOutInitialWidth: 1920 - ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 120 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4ExtraSceSysFile: - ps4NPtitleDatPath: - ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: - ps4PlayTogetherPlayerCount: 0 - ps4EnterButtonAssignment: 1 - ps4ApplicationParam1: 0 - ps4ApplicationParam2: 0 - ps4ApplicationParam3: 0 - ps4ApplicationParam4: 0 - ps4DownloadDataSize: 0 - ps4GarlicHeapSize: 2048 - ps4ProGarlicHeapSize: 2560 - playerPrefsMaxSize: 32768 - ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ - ps4pnSessions: 1 - ps4pnPresence: 1 - ps4pnFriends: 1 - ps4pnGameCustomData: 1 - playerPrefsSupport: 0 - enableApplicationExit: 0 - resetTempFolder: 1 - restrictedAudioUsageRights: 0 - ps4UseResolutionFallback: 0 - ps4ReprojectionSupport: 0 - ps4UseAudio3dBackend: 0 - ps4UseLowGarlicFragmentationMode: 1 - ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 3 - ps4Audio3dVirtualSpeakerCount: 14 - ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: - ps4PatchDayOne: 0 - ps4attribUserManagement: 0 - ps4attribMoveSupport: 0 - ps4attrib3DSupport: 0 - ps4attribShareSupport: 0 - ps4attribExclusiveVR: 0 - ps4disableAutoHideSplash: 0 - ps4videoRecordingFeaturesUsed: 0 - ps4contentSearchFeaturesUsed: 0 - ps4CompatibilityPS5: 0 - ps4GPU800MHz: 1 - ps4attribEyeToEyeDistanceSettingVR: 0 - ps4IncludedModules: [] - ps4attribVROutputEnabled: 0 - monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: 25710e0fd7141f04092a64c3c88d89f4, - type: 3} - splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 - spritePackerPolicy: - webGLMemorySize: 256 - webGLExceptionSupport: 1 - webGLNameFilesAsHashes: 0 - webGLDataCaching: 0 - webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: - webGLTemplate: APPLICATION:Default - webGLAnalyzeBuildSize: 0 - webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 1 - webGLLinkerTarget: 1 - webGLThreadsSupport: 0 - webGLWasmStreaming: 0 - scriptingDefineSymbols: - 1: FAIRYGUI_TOLUA;Build_App;NOT_HOUSE_TEST - 2: Build_App - 4: FAIRYGUI_TOLUA;Build_App;NOT_ACCOUT_TEST;NOT_HOUSE_TEST - 7: FAIRYGUI_TOLUA;Build_App;NOT_ACCOUT_TEST;NOT_HOUSE_TEST - platformArchitecture: - iPhone: 1 - scriptingBackend: - Android: 0 - Standalone: 1 - iPhone: 1 - il2cppCompilerConfiguration: {} - managedStrippingLevel: {} - incrementalIl2cppBuild: {} - allowUnsafeCode: 0 - additionalIl2CppArgs: - scriptingRuntimeVersion: 1 - gcIncremental: 0 - gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: - Android: 3 - iPhone: 3 - m_RenderingPath: 1 - m_MobileRenderingPath: 1 - metroPackageName: phz_unity - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: - metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: phz_unity - wsaImages: {} - metroTileShortName: - metroTileShowName: 0 - metroMediumTileShowName: 0 - metroLargeTileShowName: 0 - metroWideTileShowName: 0 - metroSupportStreamingInstall: 0 - metroLastRequiredScene: 0 - metroDefaultTileSize: 1 - metroTileForegroundText: 1 - metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, - a: 1} - metroSplashScreenUseBackgroundColor: 1 - platformCapabilities: {} - metroTargetDeviceFamilies: {} - metroFTAName: - metroFTAFileTypes: [] - metroProtocolName: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: - XboxOneVersion: 1.0.0.0 - XboxOnePackageEncryption: 0 - XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: - XboxOneLanguage: - - enus - XboxOneCapability: [] - XboxOneGameRating: {} - XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 0 - XboxOneSockets: {} - XboxOneSplashScreen: {fileID: 0} - XboxOneAllowedProductIds: [] - XboxOnePersistentLocalStorageSize: 0 - XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} - cloudServicesEnabled: {} - luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: - luminCert: - m_CertPath: - m_SignPackage: 1 - luminIsChannelApp: 0 - luminVersion: - m_VersionCode: 1 - m_VersionName: - apiCompatibilityLevel: 6 - cloudProjectId: - framebufferDepthMemorylessMode: 0 - projectName: - organizationId: - cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 - legacyClampBlendShapeWeights: 1 diff --git a/wb_unity_pro/--ProjectSettings/ProjectVersion.txt b/wb_unity_pro/--ProjectSettings/ProjectVersion.txt deleted file mode 100644 index a12731e7..00000000 --- a/wb_unity_pro/--ProjectSettings/ProjectVersion.txt +++ /dev/null @@ -1,2 +0,0 @@ -m_EditorVersion: 2019.4.10f1 -m_EditorVersionWithRevision: 2019.4.10f1 (5311b3af6f69) diff --git a/wb_unity_pro/--ProjectSettings/QualitySettings.asset b/wb_unity_pro/--ProjectSettings/QualitySettings.asset deleted file mode 100644 index cfe3c550..00000000 --- a/wb_unity_pro/--ProjectSettings/QualitySettings.asset +++ /dev/null @@ -1,265 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!47 &1 -QualitySettings: - m_ObjectHideFlags: 0 - serializedVersion: 5 - m_CurrentQuality: 6 - m_QualitySettings: - - serializedVersion: 2 - name: Fastest - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 15 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 1 - textureQuality: 1 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.3 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Fast - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 16 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Simple - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.7 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Good - pixelLightCount: 2 - shadows: 2 - shadowResolution: 1 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 40 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - skinWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 1 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 256 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Beautiful - pixelLightCount: 3 - shadows: 2 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 70 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - skinWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 2 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 1.5 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 1024 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Fantastic - pixelLightCount: 4 - shadows: 2 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 150 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - skinWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 2 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 2 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: qyq - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 0 - shadowCascades: 1 - shadowDistance: 0 - shadowNearPlaneOffset: 0 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 1 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 2 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} - excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 6 - Standalone: 6 - WebGL: 0 - iPhone: 6 diff --git a/wb_unity_pro/--ProjectSettings/TagManager.asset b/wb_unity_pro/--ProjectSettings/TagManager.asset deleted file mode 100644 index 2fdb6669..00000000 --- a/wb_unity_pro/--ProjectSettings/TagManager.asset +++ /dev/null @@ -1,44 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!78 &1 -TagManager: - serializedVersion: 2 - tags: - - Stage Camera - layers: - - Default - - TransparentFX - - Ignore Raycast - - - - Water - - UI - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - m_SortingLayers: - - name: Default - uniqueID: 0 - locked: 0 diff --git a/wb_unity_pro/--ProjectSettings/TimeManager.asset b/wb_unity_pro/--ProjectSettings/TimeManager.asset deleted file mode 100644 index a2dc235c..00000000 --- a/wb_unity_pro/--ProjectSettings/TimeManager.asset +++ /dev/null @@ -1,8 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!5 &1 -TimeManager: - m_ObjectHideFlags: 0 - Fixed Timestep: 0.02 - Maximum Allowed Timestep: 0.33333334 - m_TimeScale: 1 diff --git a/wb_unity_pro/--ProjectSettings/UnityConnectSettings.asset b/wb_unity_pro/--ProjectSettings/UnityConnectSettings.asset deleted file mode 100644 index fa0b1465..00000000 --- a/wb_unity_pro/--ProjectSettings/UnityConnectSettings.asset +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!310 &1 -UnityConnectSettings: - m_ObjectHideFlags: 0 - serializedVersion: 1 - m_Enabled: 0 - m_TestMode: 0 - m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events - m_EventUrl: https://cdp.cloud.unity3d.com/v1/events - m_ConfigUrl: https://config.uca.cloud.unity3d.com - m_TestInitMode: 0 - CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com - m_Enabled: 0 - m_LogBufferSize: 10 - m_CaptureEditorExceptions: 1 - UnityPurchasingSettings: - m_Enabled: 0 - m_TestMode: 0 - UnityAnalyticsSettings: - m_Enabled: 0 - m_TestMode: 0 - m_InitializeOnStartup: 1 - UnityAdsSettings: - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_IosGameId: - m_AndroidGameId: - m_GameIds: {} - m_GameId: - PerformanceReportingSettings: - m_Enabled: 0 diff --git a/wb_unity_pro/--ProjectSettings/VFXManager.asset b/wb_unity_pro/--ProjectSettings/VFXManager.asset deleted file mode 100644 index 6e0eaca4..00000000 --- a/wb_unity_pro/--ProjectSettings/VFXManager.asset +++ /dev/null @@ -1,11 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!937362698 &1 -VFXManager: - m_ObjectHideFlags: 0 - m_IndirectShader: {fileID: 0} - m_CopyBufferShader: {fileID: 0} - m_SortShader: {fileID: 0} - m_RenderPipeSettingsPath: - m_FixedTimeStep: 0.016666668 - m_MaxDeltaTime: 0.05 diff --git a/wb_unity_pro/--ProjectSettings/XRSettings.asset b/wb_unity_pro/--ProjectSettings/XRSettings.asset deleted file mode 100644 index 482590c1..00000000 --- a/wb_unity_pro/--ProjectSettings/XRSettings.asset +++ /dev/null @@ -1,10 +0,0 @@ -{ - "m_SettingKeys": [ - "VR Device Disabled", - "VR Device User Alert" - ], - "m_SettingValues": [ - "False", - "False" - ] -} \ No newline at end of file diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png index 52652e56..81e8cd61 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png index dd25c833..e8127b27 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png index 8ce30330..cd9603be 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png index 99d4243f..696ef1a1 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png index 930f5d09..4b08989e 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index 54e4d454..84a9f1ec 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ diff --git a/wb_unity_pro/Assets/Scripts/Game/Utils.cs b/wb_unity_pro/Assets/Scripts/Game/Utils.cs index 0dac55c0..60c1d96f 100644 --- a/wb_unity_pro/Assets/Scripts/Game/Utils.cs +++ b/wb_unity_pro/Assets/Scripts/Game/Utils.cs @@ -135,13 +135,13 @@ namespace Game }); } - public static string TextOmit(string str, int num) + public static string TextOmit(string str, int num, string over) { StringInfo info = new StringInfo(str); if (info.LengthInTextElements > num) { - return info.SubstringByTextElements(0, 6) + "..."; + return info.SubstringByTextElements(0, 6) + over; } return str; diff --git a/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs b/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs index 1c11831e..71116280 100644 --- a/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs +++ b/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs @@ -215,10 +215,11 @@ public class Game_UtilsWrap { try { - ToLua.CheckArgsCount(L, 2); + ToLua.CheckArgsCount(L, 3); string arg0 = ToLua.CheckString(L, 1); int arg1 = (int)LuaDLL.luaL_checknumber(L, 2); - string o = Game.Utils.TextOmit(arg0, arg1); + string arg2 = ToLua.CheckString(L, 3); + string o = Game.Utils.TextOmit(arg0, arg1, arg2); LuaDLL.lua_pushstring(L, o); return 1; } diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index dbe4feae..ab54858e 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.6", + "ver": "1.0.9", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "rank", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/rank" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_majiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_majiang" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_poker", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_poker" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_zipai", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_zipai" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_pokemajiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_zipaimajiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/ProjectSettings/AudioManager.asset b/wb_unity_pro/ProjectSettings/AudioManager.asset index 1f0e6e42..2c4f5a1b 100644 Binary files a/wb_unity_pro/ProjectSettings/AudioManager.asset and b/wb_unity_pro/ProjectSettings/AudioManager.asset differ diff --git a/wb_unity_pro/ProjectSettings/ClusterInputManager.asset b/wb_unity_pro/ProjectSettings/ClusterInputManager.asset index bfd5b078..e7886b26 100644 Binary files a/wb_unity_pro/ProjectSettings/ClusterInputManager.asset and b/wb_unity_pro/ProjectSettings/ClusterInputManager.asset differ diff --git a/wb_unity_pro/ProjectSettings/DynamicsManager.asset b/wb_unity_pro/ProjectSettings/DynamicsManager.asset index a12bcd09..3534236e 100644 Binary files a/wb_unity_pro/ProjectSettings/DynamicsManager.asset and b/wb_unity_pro/ProjectSettings/DynamicsManager.asset differ diff --git a/wb_unity_pro/ProjectSettings/EditorBuildSettings.asset b/wb_unity_pro/ProjectSettings/EditorBuildSettings.asset index beb19ffd..6c30e0b3 100644 Binary files a/wb_unity_pro/ProjectSettings/EditorBuildSettings.asset and b/wb_unity_pro/ProjectSettings/EditorBuildSettings.asset differ diff --git a/wb_unity_pro/ProjectSettings/EditorSettings.asset b/wb_unity_pro/ProjectSettings/EditorSettings.asset index c727e184..8154aabe 100644 Binary files a/wb_unity_pro/ProjectSettings/EditorSettings.asset and b/wb_unity_pro/ProjectSettings/EditorSettings.asset differ diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index 617c0aa4..a7bcfc3d 100644 Binary files a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset and b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset differ diff --git a/wb_unity_pro/ProjectSettings/InputManager.asset b/wb_unity_pro/ProjectSettings/InputManager.asset index 488d0853..17c8f538 100644 Binary files a/wb_unity_pro/ProjectSettings/InputManager.asset and b/wb_unity_pro/ProjectSettings/InputManager.asset differ diff --git a/wb_unity_pro/ProjectSettings/NavMeshAreas.asset b/wb_unity_pro/ProjectSettings/NavMeshAreas.asset index e5d48aba..a04f35c7 100644 Binary files a/wb_unity_pro/ProjectSettings/NavMeshAreas.asset and b/wb_unity_pro/ProjectSettings/NavMeshAreas.asset differ diff --git a/wb_unity_pro/ProjectSettings/Physics2DSettings.asset b/wb_unity_pro/ProjectSettings/Physics2DSettings.asset index 958b6362..7e9e664f 100644 Binary files a/wb_unity_pro/ProjectSettings/Physics2DSettings.asset and b/wb_unity_pro/ProjectSettings/Physics2DSettings.asset differ diff --git a/wb_unity_pro/ProjectSettings/PresetManager.asset b/wb_unity_pro/ProjectSettings/PresetManager.asset index 5b82caa2..636a595b 100644 Binary files a/wb_unity_pro/ProjectSettings/PresetManager.asset and b/wb_unity_pro/ProjectSettings/PresetManager.asset differ diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset index ca6a2bfd..fd2f0474 100644 --- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset +++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 20 productGUID: e1a65d9d6ea2df349816f24ffdb49f72 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -12,17 +12,17 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: dy - productName: "\u5FEB\u4E50\u5E7F\u4E1C" + companyName: qyhy + productName: "\u68CB\u6E90\u4E92\u5A31" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} - m_ShowUnitySplashScreen: 0 - m_ShowUnitySplashLogo: 0 + m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 0 - m_SplashScreenAnimation: 0 + m_SplashScreenAnimation: 2 m_SplashScreenLogoStyle: 1 - m_SplashScreenDrawMode: 1 + m_SplashScreenDrawMode: 0 m_SplashScreenBackgroundAnimationZoom: 0 m_SplashScreenLogoAnimationZoom: 0 m_SplashScreenBackgroundLandscapeAspect: 1 @@ -54,7 +54,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - displayResolutionDialog: 0 iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 0 @@ -87,7 +86,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -95,7 +93,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 0 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 0 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -108,6 +105,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 1048576 switchQueueControlMemory: 16384 @@ -115,14 +113,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 0 5:4: 0 16:10: 0 16:9: 1 Others: 0 - bundleVersion: 1.0.0 + bundleVersion: 1.0.2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -154,28 +158,28 @@ PlayerSettings: dashSupport: 1 lowOverheadMode: 0 protectedContext: 0 - v2Signing: 0 + v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.dangdanggame.csyx2 - Standalone: "unity.dy.\u8DA3\u73A9" + Android: com.jxgame.qyhy + Standalone: unity.dy.qp0101 Tizen: com.dangdanggame.csyx5 - iPhone: com.dangdanggame.csyx3 + iPhone: com.lbgame.sanmu tvOS: com.dangdanggame.csyx5 buildNumber: iPhone: 1 AndroidBundleVersionCode: 12 - AndroidMinSdkVersion: 16 - AndroidTargetSdkVersion: 0 + AndroidMinSdkVersion: 22 + AndroidTargetSdkVersion: 26 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 0 @@ -189,32 +193,16 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -266,8 +254,8 @@ PlayerSettings: AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 2 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: Assets/../debug.keystore' - AndroidKeyaliasName: androiddebugkey + AndroidKeystoreName: '{inproject}: smn.keystore' + AndroidKeyaliasName: smn AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 @@ -282,18 +270,53 @@ PlayerSettings: androidGamepadSupportLevel: 1 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: - m_BuildTarget: m_Icons: - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: dda4728053c74c04cade51d6daf2f62f, type: 3} + m_Icon: {fileID: 2800000, guid: 0c96432335c56464db3c605e4582334f, type: 3} m_Width: 128 m_Height: 128 m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: + - m_Textures: + - {fileID: 0} + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 0} + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 0} + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 0} + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 0} + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 0} + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: - m_Textures: [] m_Width: 432 m_Height: 432 @@ -324,70 +347,177 @@ PlayerSettings: m_Height: 81 m_Kind: 2 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 0} m_Width: 192 m_Height: 192 m_Kind: 0 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 0} m_Width: 144 m_Height: 144 m_Kind: 0 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 0} m_Width: 96 m_Height: 96 m_Kind: 0 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 0} m_Width: 72 m_Height: 72 m_Kind: 0 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 0} m_Width: 48 m_Height: 48 m_Kind: 0 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 0} m_Width: 36 m_Height: 36 m_Kind: 0 m_SubKind: + - m_BuildTarget: iPhone + m_Icons: - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 1 - m_SubKind: + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 1 - m_SubKind: + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 1 - m_SubKind: + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 1 - m_SubKind: + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad - m_Textures: [] - m_Width: 36 - m_Height: 36 + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 m_Kind: 1 - m_SubKind: + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store m_BuildTargetBatching: - m_BuildTarget: Android m_StaticBatching: 1 m_DynamicBatching: 1 + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: CloudRendering + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 080000000b000000 @@ -403,7 +533,6 @@ PlayerSettings: openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 - vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -525,6 +654,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -581,6 +711,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -606,6 +737,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 @@ -622,8 +754,11 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: 25710e0fd7141f04092a64c3c88d89f4, type: 3} @@ -650,10 +785,10 @@ PlayerSettings: 4: FAIRYGUI_TOLUA;Build_App;NOT_ACCOUT_TEST;NOT_HOUSE_TEST 7: FAIRYGUI_TOLUA;Build_App;NOT_ACCOUT_TEST;NOT_HOUSE_TEST platformArchitecture: - iPhone: 0 + iPhone: 1 scriptingBackend: Android: 0 - Standalone: 0 + Standalone: 1 iPhone: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: {} @@ -663,7 +798,9 @@ PlayerSettings: scriptingRuntimeVersion: 1 gcIncremental: 0 gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Android: 3 + iPhone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: phz_unity @@ -717,8 +854,8 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} @@ -735,13 +872,6 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.1 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 apiCompatibilityLevel: 6 cloudProjectId: framebufferDepthMemorylessMode: 0 diff --git a/wb_unity_pro/ProjectSettings/QualitySettings.asset b/wb_unity_pro/ProjectSettings/QualitySettings.asset index 0f864895..cfe3c550 100644 Binary files a/wb_unity_pro/ProjectSettings/QualitySettings.asset and b/wb_unity_pro/ProjectSettings/QualitySettings.asset differ diff --git a/wb_unity_pro/ProjectSettings/TagManager.asset b/wb_unity_pro/ProjectSettings/TagManager.asset index 08e0b02b..2fdb6669 100644 Binary files a/wb_unity_pro/ProjectSettings/TagManager.asset and b/wb_unity_pro/ProjectSettings/TagManager.asset differ diff --git a/wb_unity_pro/ProjectSettings/TimeManager.asset b/wb_unity_pro/ProjectSettings/TimeManager.asset index cbc49e65..a2dc235c 100644 Binary files a/wb_unity_pro/ProjectSettings/TimeManager.asset and b/wb_unity_pro/ProjectSettings/TimeManager.asset differ diff --git a/wb_unity_pro/ProjectSettings/UnityConnectSettings.asset b/wb_unity_pro/ProjectSettings/UnityConnectSettings.asset index 79b4e75f..fa0b1465 100644 Binary files a/wb_unity_pro/ProjectSettings/UnityConnectSettings.asset and b/wb_unity_pro/ProjectSettings/UnityConnectSettings.asset differ diff --git a/wb_unity_pro/ProjectSettings/VFXManager.asset b/wb_unity_pro/ProjectSettings/VFXManager.asset index 46ed30ac..6e0eaca4 100644 Binary files a/wb_unity_pro/ProjectSettings/VFXManager.asset and b/wb_unity_pro/ProjectSettings/VFXManager.asset differ