Commit Graph

11737 Commits (11b9a285ba54b6c2b2d349f420cf9cb17477a4f7)
 

Author SHA1 Message Date
ZhangBiao 11b9a285ba 【家园】upview提交 2022-01-06 16:41:17 +08:00
ZhangBiao 6b1c28a920 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2022-01-06 16:40:24 +08:00
ZhangBiao 1d26591062 【家园】资源提交 2022-01-06 16:27:09 +08:00
ZhangBiao 6f2b684ecd 【家园】提交 2022-01-06 16:25:20 +08:00
jiaoyangna e484b2bac8 星力聚灵资源提交 2022-01-06 16:15:49 +08:00
jiaoyangna 757c436878 编队预设提交 2022-01-06 16:12:10 +08:00
jiaoyangna b1be355601 Merge branch 'tansuo' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2022-01-06 16:07:59 +08:00
ZhangBiao cb9fc77b15 【家园】摘星阁文字提示提交 2022-01-06 15:52:51 +08:00
ZhangBiao 9c874f1789 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
2022-01-06 15:38:48 +08:00
jiaoyangna ac7a0a5ce6 资源提交 2022-01-06 15:38:24 +08:00
wangzhenxing f89526d96a [战斗]===========被动新增 414 -417 2022-01-06 15:30:40 +08:00
ZhangBiao 4133605f55 【家园】引导提交 2022-01-06 15:28:41 +08:00
jiaoyangna f3349ca4d1 【ID1010966】
【优化】法宝聚灵调整
2022-01-06 15:18:30 +08:00
jiaoyangna 9c1eb41856 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 14:52:22 +08:00
jiaoyangna 79364232f0 【ID1010966】
【优化】法宝聚灵调整
2022-01-06 14:52:02 +08:00
ZhangBiao 0c3c8e8c62 Merge branch '0功能/家园' of http://60.1.1.230/gaoxin/JL_Client into 0功能/家园 2022-01-06 14:23:51 +08:00
skuld 8f8e86d7c5 bat Resource Commit:2022/01/09, 4:55:32 2022-01-09 04:55:32 +08:00
ZhangBiao 7058575f3a 【家园】提交 2022-01-06 14:23:41 +08:00
gaoxin 7c0726e5b9 【神将详情】根据魂印的显示修改界面的大小 2022-01-06 12:03:35 +08:00
ZhangBiao 404618f9bc 【家园】摘星阁突破显示 2022-01-06 11:53:37 +08:00
ZhangBiao 68ad9cf7e1 【家园】提交 2022-01-06 11:45:28 +08:00
jiaoyangna c8b604bde4 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 11:30:35 +08:00
ZhangBiao 499e1d2d49 【家园】界面微调 2022-01-06 10:56:59 +08:00
ZhangBiao 893e33d920 【家园】提交 2022-01-06 10:33:08 +08:00
jiaoyangna 130e38f5b2 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 10:29:32 +08:00
jiaoyangna e9bfed6ab6 添加新的规则游戏报错修改 2022-01-06 10:20:27 +08:00
jiaoyangna 2b588340aa 【ID1019476】
【探索】称号遮挡复活中
2022-01-06 09:49:17 +08:00
ZhangBiao 2f03bf5ab7 【家园】提交 2022-01-05 19:12:54 +08:00
jiaoyangna 27a96fa139 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-05 18:18:06 +08:00
jiaoyangna 2a8b4bca8c 【ID1010994】
增加单笔充值活动
2022-01-05 18:17:36 +08:00
ZhangBiao 29a16ba5c8 【家园】提交 2022-01-05 18:16:10 +08:00
ZhangBiao aa761fc4e9 【家园】提交 2022-01-05 18:04:57 +08:00
gaoxin 662ad26223 【优化】心魔/四灵试炼增加编队按钮 2022-01-05 17:25:39 +08:00
ZhangBiao b45f74781c 【家园】提交 2022-01-05 17:06:34 +08:00
ZhangBiao 6f4942e87e 【家园】提交 2022-01-05 16:21:20 +08:00
jiaoyangna 8ab7558cac Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-05 15:38:23 +08:00
jiaoyangna 6ca1e17d52 【ID1010994】
增加单笔充值活动
2022-01-05 15:38:02 +08:00
ZhangBiao f0de43aad2 【家园】提交 2022-01-05 14:17:53 +08:00
ZhangBiao a4ab9eb231 【家园】报错提交 2022-01-05 11:05:11 +08:00
ZhangBiao 792a85407b 【坐骑】不显示修改 2022-01-05 11:00:59 +08:00
ZhangBiao ee7dc987a8 【家园】资源 2022-01-05 10:40:12 +08:00
ZhangBiao c0d27feac2 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2022-01-05 10:16:25 +08:00
ZhangBiao 19c27ae7bb 【家园】提交 2022-01-05 10:12:23 +08:00
ZhangBiao 5e0c53e322 【家园】替换底图 2022-01-04 18:58:34 +08:00
ZhangBiao 18ee882c96 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-04 16:58:07 +08:00
ZhangBiao 14044932b5 【命格】属性加成报错修改 2022-01-04 16:57:52 +08:00
jiaoyangna 7bfa7057ac 位置修改提交 2022-01-04 16:51:44 +08:00
jiaoyangna 7eade17002 提示位置修改提交 2022-01-04 16:47:24 +08:00
jiaoyangna 99014979b1 添加提示 2022-01-04 16:43:35 +08:00
jiaoyangna fb8de57afa 累计收益提交 2022-01-04 16:30:50 +08:00