Commit Graph

4381 Commits (f70ffde7d1cd57258415933bb79e624a0866e70d)
 

Author SHA1 Message Date
Fuhaifeng f70ffde7d1 增加内存回收.主动式间隔60秒;设置目标帧速率30; 2020-12-26 17:43:14 +08:00
Fuhaifeng 30b01aaae5 no message 2020-12-26 16:22:10 +08:00
Fuhaifeng 9d68a6ffc9 Merge branch 'master_develop' into Dev_Fuhaifeng_NetCode_Fixed
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta
#	Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/StreamingAssets/lua.meta
2020-12-26 16:21:07 +08:00
Fuhaifeng a27b39db2c no message 2020-12-26 16:06:11 +08:00
jiaoyangna 9b8d5a3ab7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-26 15:48:53 +08:00
jiaoyangna 4568b19000 红点报错 修改 2020-12-26 15:48:26 +08:00
gaoxin 3ee0f718c6 【资源】增加活动及系统需求图片资源 meta文件提交 2020-12-26 14:52:01 +08:00
zhangqiang e5f845b3a0 【跨服天梯】 获取好友信息加判断 2020-12-26 14:36:38 +08:00
jiaoyangna 3b615515d8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-26 12:19:36 +08:00
jiaoyangna 83f6739f60 刷新礼包修改 2020-12-26 12:19:29 +08:00
zhangqiang 177ac7781d 【资源导入】 buff图标 和 状态字混乱 2020-12-26 11:59:03 +08:00
jiaoyangna a7a577222d 刷新礼包修改 2020-12-26 11:48:00 +08:00
zhangqiang e38c766348 Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua
2020-12-26 11:45:20 +08:00
zhangqiang 2b274d75de Merge branch 'master_xma_local' into 0功能/跨服天梯
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
2020-12-26 11:43:39 +08:00
zhangqiang f708ab0ed0 【跨服天梯】提交 2020-12-26 11:41:41 +08:00
zhangqiang b19af7b8e0 【跨服天梯】加性别 2020-12-26 11:40:56 +08:00
ZhangBiao 64dcd0cf80 【增加特效】增加混乱特效 2020-12-26 11:37:20 +08:00
liuyipeng 5e6360116f 增加活动及系统需求图片资源 2020-12-25 19:53:22 +08:00
gaoxin c16ab8cdee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-25 15:50:23 +08:00
gaoxin 58a6c8c2db Merge remote-tracking branch 'origin/gx/xma_local' into master_develop 2020-12-25 15:49:59 +08:00
gaoxin aaf7a4f470 【引导】修复会部分功能重复开启会重复引导的问题 2020-12-25 15:34:38 +08:00
jiaoyangna 7c665597ff 【逍遥游优化】逍遥游玩法优化内容 2020-12-25 14:49:56 +08:00
wangzhenxing d6d8590ce2 [战斗]修改切磋判断胜负条件 2020-12-25 15:40:13 +09:00
ZhangBiao 20e451dfcd 【森罗幻境】红点修改
(cherry picked from commit 6945cbcacf)
2020-12-25 12:09:12 +08:00
wangzhenxing 6f38041f2e [优化]魂宝灵宝加号点击区域扩大 2020-12-25 10:57:32 +09:00
wangzhenxing a839db7119 [优化]【ID1007687】
【优化】魂宝、灵宝各自添加加号,点击后显示获取途径以及跳转
2020-12-24 19:57:19 +09:00
ZhangBiao b094a73fa7 【降妖夺宝】界面调整
(cherry picked from commit 6befa383c8)
2020-12-24 18:37:28 +08:00
jiaoyangna bbf155d7be Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 18:02:34 +08:00
jiaoyangna 876fddb02b 逍遥 红点提交 2020-12-24 18:02:21 +08:00
ZhangBiao e5b00c5cd9 【无尽副本】重置事件点无法触碰修复 2020-12-24 18:00:02 +08:00
ZhangBiao 46500fd5f9 【森罗幻境】炸弹炸小怪也计入击杀 2020-12-24 17:13:29 +08:00
ZhangBiao 5e1073fc80 【降妖夺宝】点击抽卡时可以切换其他界面修复
(cherry picked from commit 601eefb120)
2020-12-24 16:58:30 +08:00
jiaoyangna 5dbb9796ed Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 16:40:59 +08:00
jiaoyangna dcc33d0124 逍遥 红点 2020-12-24 16:40:54 +08:00
guowei a4bcc10bd6 Merge branch '0功能/1230版本优化内容' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-12-24 16:37:33 +08:00
ZhangBiao 150ec3eb2f 【道具使用跳转】跳转后返回关闭弹窗界面 2020-12-24 16:33:15 +08:00
jiaoyangna 1f05f5f8f6 逍遥游 红点提交 2020-12-24 16:19:46 +08:00
jiaoyangna e95ae4724b 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:32 +08:00
jiaoyangna 29c5c08ea4 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:22 +08:00
jiaoyangna e7698bd4e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 16:11:12 +08:00
jiaoyangna 3782230926 逍遥红点 2020-12-24 16:11:07 +08:00
zhangqiang 26d714e1c5 【优化】等级成长礼 2020-12-24 16:06:10 +08:00
ZhangBiao bc582d93e0 【增加跳转】化灵符跳转零售特惠 2020-12-24 15:57:51 +08:00
ZhangBiao a3833e153e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 15:41:03 +08:00
ZhangBiao b2f8d14470 【道具使用跳转】使用跳转修改,活动道具要大于10000 2020-12-24 15:40:30 +08:00
jiaoyangna 9777af3709 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 15:36:02 +08:00
jiaoyangna a2442f3f39 逍遥游 红点提交 2020-12-24 15:35:56 +08:00
ZhangBiao 37a426d46d Merge branch '0功能/1230版本优化内容' into master_develop
# Conflicts:
#	Assets/LuaFramework/Scripts/SurplusScripts.meta
#	Assets/LuaFramework/Scripts/SurplusScripts/Example.meta
#	Assets/LuaFramework/Scripts/SurplusScripts/Mgr.meta
#	Assets/LuaFramework/Scripts/SurplusScripts/MixCode.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_100912bgj_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/UI/common/UI_schl_loop.ogg.meta
#	Assets/ManagedResources/PublicArtRes/Models/Materials.meta
2020-12-24 15:17:39 +08:00
ZhangBiao c57944e742 Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-24 15:13:15 +08:00
ZhangBiao 78ead0e8ad 【大闹天宫】一键上阵招募英雄 2020-12-24 15:13:03 +08:00