Commit Graph

8421 Commits (4c00b471ada963556f38401ac84bd5352385305f)

Author SHA1 Message Date
gaoxin d67f8cd2fa 【云梦豪礼】添加198裆位 2022-01-13 17:34:51 +08:00
ZhangBiao f94e79b6e2 【百宝商会】新增跳转 2022-01-11 11:29:43 +08:00
jiaoyangna 6bb00a785c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 11:28:58 +08:00
jiaoyangna 40e37473dc 【ID1011029】
【优化】 神将界面优化
2022-01-11 11:09:44 +08:00
ZhangBiao c40be4411d 【家园】特权时间显示跳帧 2022-01-10 18:22:20 +08:00
ZhangBiao 893a8dd10b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 17:38:20 +08:00
ZhangBiao 567f5c1aa0 【家园】升级倒计时显示错误修改 2022-01-10 17:38:02 +08:00
ZhangBiao cc3791e0d5 【家园】修改到达上线提示文字、红点修改 2022-01-10 17:24:39 +08:00
gaoxin 28df447f1a 【限时升星】红点刷新不及时 2022-01-10 16:30:01 +08:00
ZhangBiao 5b796d8246 【命格】红点显示不正确 2022-01-10 15:48:38 +08:00
ZhangBiao 6b2860c5f4 【命格】获得命石后,有可穿戴入口没红点 2022-01-10 15:38:20 +08:00
ZhangBiao 2455410a0c 【命格】镶嵌按钮显示穿戴 2022-01-10 15:29:37 +08:00
ZhangBiao 0a947e37a2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 15:23:12 +08:00
ZhangBiao 7e96ae056f 【连购礼包】顺序错误修改 2022-01-10 15:23:02 +08:00
wangzhenxing 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
gaoxin 4f321a8b4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 15:06:33 +08:00
gaoxin 6ddd4c543f 【修为】修为点击问号,弹出鬼畜动画,当前是元婴期 2022-01-10 15:06:16 +08:00
ZhangBiao 3e11f70576 【云游商人】选择升级的装备,显示可以选择全部 2022-01-10 14:56:50 +08:00
gaoxin f6463e72c8 【限时升星】添加锁定提示 2022-01-10 14:30:45 +08:00
wangzhenxing ec1f5be131 [战斗]======被动414修改 2022-01-10 14:22:57 +08:00
jiaoyangna 018b4f9eeb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 13:36:11 +08:00
jiaoyangna 17615c95b8 法宝聚灵文字修改 2022-01-10 13:35:40 +08:00
gaoxin ee60ae6c9a 【限时升星】显示优化,红点添加,条件屏蔽添加 2022-01-10 11:44:39 +08:00
gaoxin dfb04baf75 【限时升星】添加可选择的升星有礼活动 2022-01-08 18:40:04 +08:00
ZhangBiao bb343cdcc5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 17:49:14 +08:00
ZhangBiao 244c8050e0 【装备】装备界面套装属性显示不正确修改 2022-01-08 17:49:04 +08:00
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 eea23a9dda 不显示收益修改提交 2022-01-07 13:58:20 +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
wangzhenxing a68fa4e0f6 【飞升】============飞升添加特效 2022-01-07 13:41:57 +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
wangzhenxing e5c176cd9f [飞升]============特效显示修改提交 2022-01-07 10:08:55 +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 90ffb03c25 【家园】协议提交 2022-01-06 16:46:31 +08:00
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 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
wangzhenxing d2b10ebb38 [飞升]=============飞升特效修改提交 2022-01-05 18:25:59 +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
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +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 14044932b5 【命格】属性加成报错修改 2022-01-04 16:57:52 +08:00
jiaoyangna bc582b85e2 层级修改提交 2022-01-04 15:54:23 +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
jiaoyangna 5e28b8ad36 添加容错 2021-12-31 18:05:55 +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 fee12d7063 顶着复活中跑 2021-12-31 17:36:11 +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
wangzhenxing 2f2634eb39 【飞升】=====代码预设提交 2021-12-31 13:50:49 +08:00
jiaoyangna a35ad65ea3 添加容错 2021-12-31 13:49:48 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
jiaoyangna 12049b61f8 探索地图报错修改 2021-12-31 12:23:46 +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 af30beccd3 资源条跳转错误修改提交 2021-12-30 18:12:56 +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 eee9a714f3 修行名字颜色修改提交 2021-12-30 15:22:06 +08:00
jiaoyangna 5d8b9ffea4 修行等级显示提交 2021-12-30 15:13:24 +08:00
jiaoyangna 973e19ac66 超值返利修改提交 2021-12-30 15:05:21 +08:00
jiaoyangna 3ad7485c1c 地图修改提交 2021-12-30 15:01:00 +08:00
jiaoyangna dc4a07c6da 名字修改提交 2021-12-30 14:57:24 +08:00
jiaoyangna 185eb85640 超值返利修改提交 2021-12-30 14:45:54 +08:00
jiaoyangna 84e7aa2ae2 超值返利修改提交 2021-12-30 14:45:23 +08:00
wangzhenxing c5d42ab873 [玉虚论道]======音效数据修改提交 2021-12-30 14:44:40 +08:00
wangzhenxing 270e359507 [玉虚论道]=====对战界面添加音效 2021-12-30 14:41:43 +08:00
jiaoyangna b118d30185 添加修行等级 2021-12-30 14:38:06 +08:00
jiaoyangna d4d1653bc2 探索优化 2021-12-30 14:01:30 +08:00
jiaoyangna 80263f61f0 探索优化提交 2021-12-30 13:50:39 +08:00
jiaoyangna 4b6de5c984 探索优化提交 2021-12-30 13:27:57 +08:00
jiaoyangna 9a0ec7feee 添加切换效果 2021-12-30 11:55:15 +08:00
ZhangBiao 0f32a05956 【装备界面】增加摘星阁加持 2021-12-30 11:49:12 +08:00
jiaoyangna 7b67ef38df Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-12-30 11:43:22 +08:00
jiaoyangna 2a14bc799f 探索中优化 2021-12-30 11:41:13 +08:00
ZhangBiao 44aa663ab0 Merge branch 'china/dev' into 0功能/家园 2021-12-30 11:24:38 +08:00
ZhangBiao f148668636 【家园】提交 2021-12-30 11:00:27 +08:00
jiaoyangna a7fde7ccf2 报错修改提交 2021-12-30 10:14:01 +08:00
jiaoyangna d17a9aa29d 死亡之后站立不动 2021-12-30 10:07:02 +08:00
ZhangBiao 630d56c810 【家园】装备强化升级 2021-12-29 20:17:45 +08:00
wangzhenxing db071514f9 【战斗】======被动283修改 2021-12-29 17:59:48 +08:00
jiaoyangna b46a62c25a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-29 17:11:09 +08:00
jiaoyangna f0a4cec767 【ID1010975】
【优化】超值返利每日首次登陆有红点提示
2021-12-29 17:10:48 +08:00
wangzhenxing d158a9451a [战斗]=======被动414 修改 2021-12-29 17:09:27 +08:00
jiaoyangna 657574b61a 探索地图修改提交 2021-12-29 16:21:59 +08:00
jiaoyangna 89c298f593 探索地图修改提交 2021-12-29 16:05:16 +08:00
jiaoyangna 4318b37891 探索中修改提交 2021-12-29 14:53:45 +08:00
jiaoyangna d91afe4326 探索 2021-12-29 14:35:11 +08:00
jiaoyangna 73eebe80e0 探索提交 2021-12-29 14:33:19 +08:00
jiaoyangna 32cc5de541 探索提交 2021-12-29 14:30:02 +08:00
jiaoyangna 4e4ebd563c 探索提交 2021-12-29 14:24:44 +08:00
ZhangBiao a1301a4a22 【家园】任务 2021-12-29 14:03:16 +08:00
jiaoyangna a6652757b1 探索提交 2021-12-29 13:29:21 +08:00
wangzhenxing 33f1934d02 【战斗】========角色皮肤释放技能表现修改 2021-12-29 13:08:32 +08:00
gaoxin 07dec9a6d5 【每日签到】分帧加载 2021-12-31 03:01:26 +08:00
gaoxin d16833005a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-31 01:45:20 +08:00
gaoxin 17394f79a0 【动画】神将切换动画优化 2021-12-31 01:45:13 +08:00
gaoxin 52229c0d94 【邮件】内容显示自适应 2021-12-31 00:24:37 +08:00
gaoxin b6a00666ae 【动画】循环列表动画修改为平移动画,拖动时不再播放动画 2021-12-30 22:09:34 +08:00
jiaoyangna 5c51490cf5 探索提交 2021-12-29 10:33:12 +08:00
jiaoyangna dac88a6dbf 探索提交 2021-12-29 10:02:22 +08:00
ZhangBiao 197b28b3da 【家园】加速确认 2021-12-28 18:27:31 +08:00
jiaoyangna d06a5e6471 探索提交 2021-12-28 18:16:28 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00
wangzhenxing 73d92664de [飞升]=======飞升逻辑提交 2021-12-28 16:20:07 +08:00
jiaoyangna 5e75e2384e 探索提交 2021-12-28 15:31:46 +08:00
jiaoyangna b40bd10a32 主城修改提交 2021-12-28 15:07:42 +08:00
ZhangBiao d81a2b7265 【命格】界面无法打开修改 2021-12-28 15:01:43 +08:00
jiaoyangna b256c7a9c5 探索提交 2021-12-28 14:50:45 +08:00
jiaoyangna 0e0f209440 探索时间选择修改 2021-12-28 13:37:30 +08:00
ZhangBiao 69cb591edb 【家园】升级进度条 2021-12-28 13:37:04 +08:00
jiaoyangna 9dafa85858 探索提交 2021-12-28 13:30:27 +08:00
ZhangBiao b66cfdc61d 【家园】提交 2021-12-28 11:54:08 +08:00
jiaoyangna 4a9792363d 协议提交 2021-12-27 17:13:54 +08:00
jiaoyangna d83373ecab Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
2021-12-27 17:00:14 +08:00
wangzhenxing 380b0bdb78 [飞升]=============飞升代码提交 2021-12-27 16:39:38 +08:00
jiaoyangna b3c0ea78ab 探索提交 2021-12-27 16:31:38 +08:00
jiaoyangna 9e47928008 探索提交 2021-12-27 16:16:56 +08:00
jiaoyangna bef8340c7c 探索 2021-12-27 15:48:09 +08:00
jiaoyangna 71496d3905 探索提交 2021-12-27 15:42:52 +08:00
wangzhenxing 07a90b7279 [战斗]=========战斗记录老虎上无敌盾记录修改 2021-12-27 15:42:38 +08:00
gaoxin 220bfff064 【优化】魂印描述优化 2021-12-30 00:54:40 +08:00
jiaoyangna b9a86b402c 探索提交 2021-12-27 14:53:55 +08:00
gaoxin dc431e3f4d 【首充收缩框】需要每次登陆后展开,当前是打开主城时展开 2021-12-27 12:05:43 +08:00
gaoxin 89f8af19c4 【主城】竖条改为初始打开 2021-12-31 01:53:05 +08:00
ZhangBiao 337261f8b2 【家园】升级,取消,加速 2021-12-24 18:20:18 +08:00
jiaoyangna 5f9f7da264 探索提交 2021-12-24 17:49:54 +08:00
jiaoyangna 577752e71d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 16:31:41 +08:00
jiaoyangna 65dbdc5283 【ID1019454】
【魂印】替换魂印时不刷新界面,需要重新进入才能看到替换后的魂印
2021-12-24 16:31:25 +08:00
wangzhenxing d3253c5edb 【战斗】========技能释放逻辑修改,技能播放技能攻击动作 2021-12-24 16:11:53 +08:00
wangzhenxing b07d5548e6 [功能]========坐骑界面选中状态修改 2021-12-24 15:45:04 +08:00
wangzhenxing ca17383879 Merge branch 'china/dev' into china/dev_res 2021-12-24 14:55:22 +08:00
jiaoyangna 2a9b8c706e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:52:23 +08:00
jiaoyangna 09a810af3f 玉帝跳转提交 2021-12-24 14:52:05 +08:00
ZhangBiao a28021b4f6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:47:52 +08:00
ZhangBiao 80b6315905 【降妖夺宝】在活动页面,进入珍奇宝阁购买野球拳,足够10连抽时,10连按钮依然显示妖晶抽取 2021-12-24 14:47:39 +08:00
jiaoyangna b33bd02c7f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:25:22 +08:00
gaoxin 9965f8e079 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 23:29:11 +08:00
gaoxin 9c22dfc990 【提审】不再显示充值竖条,也不再触发相关引导 2021-12-30 23:28:55 +08:00
ZhangBiao fea92ffabc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:20:06 +08:00
jiaoyangna 36ec134505 玉帝获取途径跳转提交 2021-12-24 14:20:06 +08:00
ZhangBiao 99d00e88e2 【命格】合成界面第一次打开道具详情 2021-12-24 14:19:47 +08:00
jiaoyangna 21e5b0846b 玉帝跳转提交 2021-12-24 14:13:39 +08:00
jiaoyangna 88130ac4dd 探索提交 2021-12-24 14:09:48 +08:00
wangzhenxing 6e2b1c1a17 [战斗]=======被动56 被动368修改 2021-12-24 14:00:51 +08:00
gaoxin e901bd9d3b 【轩辕宝镜】通关到最后一层,打开界面时列表位置没有固定在最新关 2021-12-30 22:37:35 +08:00
gaoxin d10d2f976a 【装备合成】添加输入改变合成数量的功能 2021-12-30 22:19:09 +08:00
gaoxin 613380a99f 【装备合成】添加长按自动增加数量功能 2021-12-30 20:32:11 +08:00
jiaoyangna 7f0e684bc0 一键探索修改提交 2021-12-24 11:18:03 +08:00
jiaoyangna 00dc90f4bb 商店报错添加容错 2021-12-24 11:05:39 +08:00
jiaoyangna 89b5eae8ec 商店添加容错 2021-12-24 10:58:55 +08:00
jiaoyangna e34092f93d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 10:54:16 +08:00
jiaoyangna b1c5113c39 商店报错添加容错 2021-12-24 10:53:26 +08:00
jiaoyangna 708a4bdef9 探索提交 2021-12-24 09:37:31 +08:00
ZhangBiao dbc3395945 【家园】详情 2021-12-24 09:33:56 +08:00
jiaoyangna 6dfafd7054 探索提交 2021-12-24 00:33:33 +08:00
jiaoyangna 130a75c8dd 探索提交 2021-12-24 00:14:32 +08:00
ZhangBiao 078c3a1f96 Merge branch 'china/dev' into 0功能/家园 2021-12-23 17:48:20 +08:00
jiaoyangna 5d37c0d4d9 探索提交 2021-12-23 17:23:02 +08:00
ZhangBiao d06fdbbac6 【玲珑宝镜】玲珑商市跟随是否活动开启显示按钮 2021-12-23 17:19:27 +08:00
ZhangBiao 7f9726e006 【命格】提交 2021-12-23 16:39:37 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
wangzhenxing c895652ef1 [战斗]======被动412 修改 2021-12-23 15:18:44 +08:00
gaoxin 7ea4c7bc51 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 00:01:21 +08:00
gaoxin da2b205955 【挂机】添加新人商城入口 2021-12-30 00:01:14 +08:00
ZhangBiao 6fe4e5d3f6 Merge branch 'china/dev' into 0功能/家园 2021-12-23 14:49:47 +08:00
wangzhenxing 3e640aef81 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-23 14:38:02 +08:00
ZhangBiao f676ae8478 【家园】提交 2021-12-23 14:38:02 +08:00
gaoxin 5eec5952ef 【协议】更新到最新 2021-12-23 14:37:31 +08:00