Commit Graph

7717 Commits (9826244e7e1e2466f05381ac9bb28fde11ffb254)

Author SHA1 Message Date
jiaoyangna 0281564bb3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 17:47:38 +08:00
gaoxin ecaa9f1dbc 【英雄选择】英雄选择界面通用化 2022-01-08 17:47:34 +08:00
jiaoyangna a0baa2e1c0 法宝聚灵增加星级加成 2022-01-08 17:47:18 +08:00
gaoxin e12ddf56c6 【编队筛选】修复呼吸闪烁 2022-01-08 14:50:34 +08:00
ZhangBiao 129250110f 【建木神树】满级取消箭头 2022-01-08 14:22:30 +08:00
ZhangBiao 9098900dc7 【建木神树】提交 2022-01-08 11:54:31 +08:00
ZhangBiao c157985e24 【建木神树】调整 2022-01-08 11:36:31 +08:00
ZhangBiao e4a5f213e8 【建木神树】显示调整 2022-01-08 11:17:26 +08:00
ZhangBiao 94cf5e4aec 【建木神树】提交 2022-01-08 10:33:31 +08:00
ZhangBiao 314cc59bbc 【建木神树】提交 2022-01-07 19:39:58 +08:00
ZhangBiao 334ba9bd19 【建木神树优化】界面中可预览当前神应属性和下级增加属性 2022-01-07 19:34:07 +08:00
ZhangBiao 35aa32fe32 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 18:22:38 +08:00
ZhangBiao f3e9d3b2a5 【云游商人】顺序修改 2022-01-07 18:22:23 +08:00
gaoxin 34e90db4fd 【编队删选】添加职业筛选效果,高亮效果颜色修改 2022-01-07 16:40:31 +08:00
wangzhenxing ac0718f8b8 [战斗]======御甲叠加逻辑修改 2022-01-07 14:19:24 +08:00
jiaoyangna 62f7222e1b 法宝聚灵界面修改提交 2022-01-07 14:03:55 +08:00
jiaoyangna 2c5f9c5473 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 13:43:37 +08:00
jiaoyangna fe4f9fdcf7 探索地图报错修改 2022-01-07 13:43:07 +08:00
ZhangBiao 61539a1e89 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 11:29:10 +08:00
ZhangBiao e16c47a8de 【家园】提交 2022-01-07 11:28:58 +08:00
jiaoyangna 31147f3c0a Revert "幸运探宝没开不需要隐藏修改"
This reverts commit 7c44812439.
2022-01-07 10:31:02 +08:00
jiaoyangna 7c44812439 幸运探宝没开不需要隐藏修改 2022-01-07 10:29:36 +08:00
jiaoyangna 082fb392d5 探索主城异常提交 2022-01-07 10:13:14 +08:00
ZhangBiao 54b01f4d86 【家园+易经宝库】提交 2022-01-06 18:42:20 +08:00
ZhangBiao a46e3263b7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 18:27:25 +08:00
ZhangBiao e0c228bf3f 【易经宝库】提交 2022-01-06 18:27:09 +08:00
jiaoyangna 79f89d355f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 18:26:08 +08:00
jiaoyangna b740f2abb7 探索引导提交 2022-01-06 18:25:28 +08:00
ZhangBiao 1373efaba8 【家园】摘星阁红点修改 2022-01-06 17:59:25 +08:00
ZhangBiao 956826c46a 【家园】摘星阁提交 2022-01-06 17:53:53 +08:00
ZhangBiao 456501e15a 【礼包】每日礼包 每周礼包 增加礼包名称展示 2022-01-06 17:10:50 +08:00
ZhangBiao 0bed9188dc 【家园】摘星阁提交 2022-01-06 17:04:13 +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 6f2b684ecd 【家园】提交 2022-01-06 16:25:20 +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
wangzhenxing f89526d96a [战斗]===========被动新增 414 -417 2022-01-06 15:30:40 +08:00
ZhangBiao 4133605f55 【家园】引导提交 2022-01-06 15:28:41 +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 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
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 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 14044932b5 【命格】属性加成报错修改 2022-01-04 16:57:52 +08:00
gaoxin 5724728062 【职业筛选】颜色修改,添加混乱 2022-01-04 15:45:06 +08:00
jiaoyangna e079eff322 适配修改提交 2022-01-04 15:42:06 +08:00
ZhangBiao a07fdc40ac 【家园】提交 2022-01-04 15:10:35 +08:00
gaoxin 9de91f4259 【修行】删除黄点显示 2022-01-04 14:30:22 +08:00
jiaoyangna ebc67f1602 战力修改提交 2022-01-04 14:21:54 +08:00
gaoxin c07ba438a0 【职业筛选】颜色修改 2022-01-04 14:07:15 +08:00
gaoxin ad8653d679 Merge branch '0优化/山河社稷图筛选显示' into china/dev 2022-01-04 13:22:22 +08:00
ZhangBiao fbe50eb413 【家园】提交 2022-01-04 10:51:59 +08:00
gaoxin 9b2057bede 【山河筛选】添加职业呼吸效果 2022-01-03 02:17:03 +08:00
ZhangBiao 39244f8ce5 【家园】特权完成,2021最后的提交!! 2021-12-31 18:58:04 +08:00
ZhangBiao 2b3afae7ea 【家园】特权 2021-12-31 18:13:10 +08:00
gaoxin 0c9b3b4f96 【角色信息】修复回收立绘错误 2021-12-31 17:55:01 +08:00
gaoxin d1b84299c2 【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS 2022-01-03 02:43:00 +08:00
jiaoyangna 330c34a0b8 探索地图人物切换修改 2021-12-31 16:32:08 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00
jiaoyangna 9880fcf8e8 地图中停止探索报错修改 2021-12-31 16:11:51 +08:00
jiaoyangna 17c6d0cdc7 地图小人挺住不动修改 2021-12-31 14:07:56 +08:00
jiaoyangna a35ad65ea3 添加容错 2021-12-31 13:49:48 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
jiaoyangna 7a9d61e8c9 地图探索修改提交 2021-12-31 11:40:42 +08:00
jiaoyangna e6061c0762 一键上阵修改提交 2021-12-31 11:18:20 +08:00
ZhangBiao bd2d5ccd50 【家园】提交 2021-12-30 20:24:59 +08:00
ZhangBiao 85319e89f0 【家园】提交 2021-12-30 20:09:16 +08:00
ZhangBiao 8de1e4e596 【家园】资源提交 2021-12-30 19:02:52 +08:00
jiaoyangna 57b0689de6 【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
2021-12-30 18:06:36 +08:00
jiaoyangna 5ab9c8d915 Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
2021-12-30 16:47:19 +08:00
ZhangBiao fc9377b8e9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 16:29:54 +08:00
ZhangBiao 5672203920 【云游商人】优化 2021-12-30 16:29:37 +08:00
wangzhenxing c318dea91a 【战前属性】====战前属性增加新类型 413计算 2021-12-30 16:22:44 +08:00
gaoxin 4c0a3a3864 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-02 02:48:25 +08:00
gaoxin f4e149e898 【邮件】有附件时添加分割线 2022-01-02 02:48:03 +08:00
ZhangBiao f500bc9ed1 【云游商人】更改索引方式 2021-12-30 15:51:12 +08:00
jiaoyangna 5d8b9ffea4 修行等级显示提交 2021-12-30 15:13:24 +08:00