Commit Graph

1179 Commits (80df51683c7f1b5fd58f5099bcf6359f2807a6f3)

Author SHA1 Message Date
wangzhenxing e734c4a03d [飞升]=======飞升修改 2022-01-20 11:41:20 +08:00
wangzhenxing 9831008684 [飞升]======飞升特效适配 2022-01-19 18:34:35 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
ZhangBiao 54aeaa2ea8 【寻仙招募】提交 2022-01-18 12:09:43 +08:00
wangzhenxing ff5866e00e [法宝详情]=======添加返回按钮 2022-01-18 11:57:38 +08:00
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
jiaoyangna a4cbd77a99 许愿神将修改提交 2022-01-17 11:23:22 +08:00
jiaoyangna 4abe2d4203 Revert "许愿神将修改提交"
This reverts commit fbd1c9aa43.
2022-01-17 11:18:55 +08:00
wangzhenxing 6be87dec74 Merge branch 'china/dev' into china/飞升 2022-01-17 11:00:42 +08:00
ZhangBiao ffbdafd13e 【修行】红点检测 2022-01-17 10:53:06 +08:00
wangzhenxing a7ad2ee1f6 Merge branch 'china/dev' into china/飞升 2022-01-17 10:50:14 +08:00
ZhangBiao 98f89d8a9b 【摘星阁+修为】装备属性展示+修为红点检测 2022-01-17 10:44:43 +08:00
ZhangBiao 91f9589043 【摘星阁】装备属性 2022-01-17 10:33:42 +08:00
ZhangBiao e93b2816b4 【摘星阁】装备摘星阁属性拆分 2022-01-17 10:24:27 +08:00
jiaoyangna fbd1c9aa43 许愿神将修改提交 2022-01-17 09:41:00 +08:00
ZhangBiao 10070d14ca 【跳转】提交 2022-01-15 18:29:18 +08:00
ZhangBiao a556bf7761 【玩家信息】提交 2022-01-15 18:17:46 +08:00
wangzhenxing 0b3007a9c7 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-15 18:16:56 +08:00
ZhangBiao 2b8cb81ff3 【充值】跳转修改 2022-01-15 18:07:43 +08:00
ZhangBiao 3ad8b6b6c3 【玩家信息】提交 2022-01-15 15:44:08 +08:00
ZhangBiao c373f8d014 【修改】提交 2022-01-15 15:05:26 +08:00
ZhangBiao bca67f4fd6 【玩家信息】报错修改 2022-01-15 13:26:22 +08:00
ZhangBiao 28d4b2a8be 【玩家信息】提交 2022-01-15 13:07:28 +08:00
ZhangBiao 7feefd2078 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-15 13:01:44 +08:00
ZhangBiao fa1c832170 【坐骑】增加详细信息 2022-01-15 13:00:45 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
ZhangBiao ed48c7ce00 【寻仙招募】修改,提交 2022-01-15 10:27:48 +08:00
ZhangBiao 232491eb95 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-15 09:14:10 +08:00
jiaoyangna 98f23e56ea 神将修改提交 2022-01-14 19:13:46 +08:00
ZhangBiao 5d2fdc5773 【仙缘汇聚箱】报错修改 2022-01-14 18:47:41 +08:00
ZhangBiao d7bd3a07d8 【心愿抽奖】报错修改 2022-01-14 18:28:36 +08:00
ZhangBiao 8f554eca59 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 16:02:59 +08:00
jiaoyangna d6521af965 许愿神将边框修改 2022-01-14 15:52:16 +08:00
ZhangBiao 28d3f421bc 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交 2022-01-14 15:44:45 +08:00
jiaoyangna 053de388f2 神将修改提交 2022-01-14 14:52:56 +08:00
ZhangBiao 771c445488 Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-14 14:16:47 +08:00
jiaoyangna 981aba2417 神将情报修改提交 2022-01-14 11:26:13 +08:00
ZhangBiao 5b36346da3 【玩家信息】提交 2022-01-13 18:29:12 +08:00
ZhangBiao 36b475ee15 【玩家信息】增加额外属性 2022-01-13 15:23:59 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
ZhangBiao 9f8ee231ac 【装备界面】排行榜数据错误修改 2022-01-11 17:51:56 +08:00
gaoxin 0ee930c550 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 14:01:01 +08:00
gaoxin 5d2838554d Merge branch '0活动/新大圣升星' into china/dev 2022-01-14 14:00:20 +08:00
gaoxin dbbfc9dfe3 【限时升星】选择神将界面标题错误 2022-01-14 11:50:16 +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 cc3791e0d5 【家园】修改到达上线提示文字、红点修改 2022-01-10 17:24:39 +08:00
ZhangBiao 6b2860c5f4 【命格】获得命石后,有可穿戴入口没红点 2022-01-10 15:38:20 +08:00
wangzhenxing 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
ZhangBiao 3e11f70576 【云游商人】选择升级的装备,显示可以选择全部 2022-01-10 14:56:50 +08:00
ZhangBiao 244c8050e0 【装备】装备界面套装属性显示不正确修改 2022-01-08 17:49:04 +08:00
gaoxin ecaa9f1dbc 【英雄选择】英雄选择界面通用化 2022-01-08 17:47:34 +08:00
ZhangBiao 94cf5e4aec 【建木神树】提交 2022-01-08 10:33:31 +08:00
ZhangBiao 956826c46a 【家园】摘星阁提交 2022-01-06 17:53:53 +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
ZhangBiao 4133605f55 【家园】引导提交 2022-01-06 15:28:41 +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
ZhangBiao 2f03bf5ab7 【家园】提交 2022-01-05 19:12:54 +08:00
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
ZhangBiao 29a16ba5c8 【家园】提交 2022-01-05 18:16:10 +08:00
ZhangBiao aa761fc4e9 【家园】提交 2022-01-05 18:04:57 +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 5e0c53e322 【家园】替换底图 2022-01-04 18:58:34 +08:00
ZhangBiao 39244f8ce5 【家园】特权完成,2021最后的提交!! 2021-12-31 18:58:04 +08:00
ZhangBiao 27ead6dcff 【家园】提交 2021-12-31 16:30:53 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +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 5672203920 【云游商人】优化 2021-12-30 16:29:37 +08:00
ZhangBiao f500bc9ed1 【云游商人】更改索引方式 2021-12-30 15:51:12 +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
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
ZhangBiao 630d56c810 【家园】装备强化升级 2021-12-29 20:17:45 +08:00
ZhangBiao a1301a4a22 【家园】任务 2021-12-29 14:03:16 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00
ZhangBiao d81a2b7265 【命格】界面无法打开修改 2021-12-28 15:01:43 +08:00
jiaoyangna 0e0f209440 探索时间选择修改 2021-12-28 13:37:30 +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
gaoxin 220bfff064 【优化】魂印描述优化 2021-12-30 00:54:40 +08:00
ZhangBiao 337261f8b2 【家园】升级,取消,加速 2021-12-24 18:20:18 +08:00
jiaoyangna 65dbdc5283 【ID1019454】
【魂印】替换魂印时不刷新界面,需要重新进入才能看到替换后的魂印
2021-12-24 16:31:25 +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
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
ZhangBiao dbc3395945 【家园】详情 2021-12-24 09:33:56 +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 7f9726e006 【命格】提交 2021-12-23 16:39:37 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
ZhangBiao 6fe4e5d3f6 Merge branch 'china/dev' into 0功能/家园 2021-12-23 14:49:47 +08:00
ZhangBiao f676ae8478 【家园】提交 2021-12-23 14:38:02 +08:00
jiaoyangna 7bb3325c99 探索提交 2021-12-23 13:09:34 +08:00
ZhangBiao e6aa1d31fe Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
2021-12-23 09:43:06 +08:00
gaoxin 39495bee28 【至尊降世】修复老活动跳转报错 2021-12-21 21:03:42 +08:00
ZhangBiao 745a9d1dae Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-20 14:07:56 +08:00
ZhangBiao df483145bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:13:57 +08:00
ZhangBiao a9b7c21fad 【道具弹窗】跳转按钮错位 2021-12-17 17:13:45 +08:00
jiaoyangna 6b234c7f2f 文字重叠修改提交 2021-12-17 16:53:26 +08:00
jiaoyangna 3119f9b277 价格描述修改 2021-12-17 16:43:24 +08:00
jiaoyangna ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
jiaoyangna 83b1fad0b7 跳转修改提交 2021-12-17 14:11:03 +08:00
jiaoyangna abb3c4ec5f 跳转修改提交 2021-12-17 13:30:45 +08:00
jiaoyangna ec53e8ad84 超值返利提交 2021-12-17 11:22:54 +08:00
jiaoyangna 740aeac6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 18:43:36 +08:00
gaoxin eaea265bc7 【物品】添加物品使用的限制等级 2021-12-26 17:35:50 +08:00
jiaoyangna c1f0e0f78b 添加选中框 2021-12-16 18:38:32 +08:00
jiaoyangna 1ae167efb5 至尊降世修改提交 2021-12-16 16:55:30 +08:00
jiaoyangna 11c4f914b5 至尊降世提交 2021-12-16 11:42:00 +08:00
jiaoyangna 73283bd818 回退修改提交 2021-12-16 10:09:48 +08:00
jiaoyangna c6eb719fa6 添加回退消耗数量 2021-12-15 14:41:04 +08:00
jiaoyangna 568ad92a9b 回退修改 2021-12-15 14:28:36 +08:00
gaoxin 8d644dd080 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-25 07:58:52 +08:00
gaoxin 973eee4b30 【物品】添加新物品类型 2021-12-25 07:58:30 +08:00
gaoxin d14c0fe589 【ID1010850】首充豪礼100元档去除 2021-12-24 17:49:17 +08:00
jiaoyangna 7e85eeaa90 【ID1010843】
增加英雄回退功能
2021-12-14 17:57:21 +08:00
jiaoyangna 0c83c3412e 【ID1010843】
增加英雄回退功能
2021-12-14 17:25:44 +08:00
ZhangBiao f248583e9e Merge branch 'china/dev' into 0功能/命格 2021-12-14 09:49:12 +08:00
ZhangBiao 13815dd2a5 【命格】提交 2021-12-14 09:48:28 +08:00
ZhangBiao 0b5c84931a 【命格】提交 2021-12-13 18:25:35 +08:00
jiaoyangna b4e7faa04c 文字修改 2021-12-13 17:44:14 +08:00
ZhangBiao 1f249735a3 【命格】提交 2021-12-13 17:38:13 +08:00
ZhangBiao 0b9bd476dd Merge branch 'china/dev' into 0功能/命格 2021-12-13 17:26:43 +08:00
ZhangBiao d91811a555 【命格】提交 2021-12-13 17:26:08 +08:00
jiaoyangna 52ad37eee0 【ID1019400】
【月卡】购买招募秘宝后不弹出激活月卡提示,领取招募秘宝奖励时才弹出,并且提示不正确
2021-12-13 16:20:48 +08:00
jiaoyangna 244aa76319 【ID1019396】
【招募秘宝】激活秘宝后没有获得980妖晶
2021-12-13 15:13:31 +08:00
ZhangBiao c11848b98a 【命格】红点提交 2021-12-10 18:27:43 +08:00
ZhangBiao ad589aa449 【命格】提交 2021-12-10 17:18:18 +08:00
ZhangBiao 4b4ae7a608 【命格】提交 2021-12-10 16:16:41 +08:00
ZhangBiao 1ae26afed2 【命格】跳转 2021-12-10 15:46:35 +08:00
ZhangBiao f09556242d Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-12-10 14:16:28 +08:00
ZhangBiao 82c89e5e7d 【命格】提交 2021-12-10 13:57:24 +08:00
jiaoyangna e33181dddb 招募秘宝提交 2021-12-10 13:41:03 +08:00
ZhangBiao bab62f274c 【命格】提交 2021-12-10 11:01:44 +08:00
ZhangBiao cb5cf43089 【命格】提交 2021-12-09 20:17:37 +08:00
ZhangBiao 9875630085 【命格】提交 2021-12-09 13:29:16 +08:00
ZhangBiao ae3a2fa3e4 【命格】提交 2021-12-08 15:40:43 +08:00
ZhangBiao 016780c7bc 【命格】命石替换 2021-12-08 14:17:18 +08:00
ZhangBiao 1efc9fc56b 【命格】命石穿戴 2021-12-08 09:29:08 +08:00
ZhangBiao 1805fe0848 【装备】出售单个装备报错修改 2021-12-01 10:16:42 +08:00
jiaoyangna 12fb7447cc 坐骑合成修改 2021-11-30 13:23:29 +08:00
wangzhenxing 0cef7683ba [战斗]======效果137修改 立绘朝向修改 2021-11-29 17:53:17 +08:00
wangzhenxing ea7e7d31be 【战中表现】======身外化身表现优化 2021-11-29 16:19:43 +08:00
jiaoyangna f6c94a3cfe 变身卡详情提交 2021-11-26 19:36:20 +08:00
gaoxin bb685191dd 【优化】设置物品显示的方法改为通用方法 2021-11-26 14:27:24 +08:00
gaoxin 3a574880ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 10:19:35 +08:00
gaoxin ad3ca2e0d2 【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型 2021-11-26 10:19:29 +08:00
ZhangBiao f83bffaf75 【固定活动】提交 2021-11-26 10:16:46 +08:00
ZhangBiao 45df1fb982 【寻仙招募】增加心愿阵营条 2021-11-26 09:54:12 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
ZhangBiao a8f666e901 【删除活动类型43】 2021-11-25 17:27:02 +08:00
ZhangBiao e4b0fd1824 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 18:14:37 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
gaoxin 4607bd2fed Merge branch '0功能/账号id校验' into china/dev 2021-11-24 16:03:34 +08:00
ZhangBiao 18648a7622 【云游商人】装备文字叠加、显示人名错误修改 2021-11-24 10:18:36 +08:00
ZhangBiao fbb58dbfdc 【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名 2021-11-22 18:44:32 +08:00
gaoxin 95382d530e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:37:38 +08:00
gaoxin 487c0d327a 【魂印穿戴】点击穿戴其他神将身上的魂印提示穿戴成功,但不显示,需要来回切换才能刷新并且看到新替换的魂印 2021-11-22 17:37:26 +08:00
ZhangBiao f4febd8ed8 【灵脉秘境】竞技场pvp切磋报错修改 2021-11-22 17:20:04 +08:00
gaoxin e800f29b33 【竞技场】查看玩家信息报错 2021-11-22 16:06:52 +08:00
ZhangBiao 95f71667fe 【灵脉秘境】提交 2021-11-19 17:23:06 +08:00
ZhangBiao 5e09e0b9a3 【灵脉秘境】切磋 2021-11-19 16:16:45 +08:00
ZhangBiao c9e465f662 【灵脉秘境】提交 2021-11-19 11:45:53 +08:00
ZhangBiao 6454e84172 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 19:07:50 +08:00
gaoxin cd291429f1 【坐骑碎片合成】删除无用代码 2021-11-18 16:05:26 +08:00
gaoxin 77c3376d82 【坐骑碎片合成】 2021-11-18 16:03:34 +08:00
ZhangBiao 79d2113bc2 【灵脉秘境】提交 2021-11-18 14:10:57 +08:00
ZhangBiao de7a516a87 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 13:30:03 +08:00
ZhangBiao 03cdea5c83 【灵脉秘境】纪录提交 2021-11-18 11:35:20 +08:00
gaoxin 3565dc2b2a 【改名时上报事件】 2021-11-18 11:34:54 +08:00
ZhangBiao 790fe1c88f 【灵脉秘境】提交 2021-11-17 18:28:59 +08:00
gaoxin 1aa2efc1b1 【装备信息】基础属性,属性多关闭打开属性少的,显示属性错误 2021-11-17 16:58:06 +08:00
ZhangBiao 2b2a77a129 【灵脉秘境】提交 2021-11-17 16:14:47 +08:00
ZhangBiao b6ce191bff 【装备界面】无法卸下调整 2021-11-17 12:34:39 +08:00
ZhangBiao 0a7d343e20 【灵脉】提交 2021-11-17 11:12:49 +08:00
ZhangBiao 6012b533ca 【灵脉秘境】提交 2021-11-16 17:34:37 +08:00
ZhangBiao 336ea6b8d3 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 17:19:01 +08:00
gaoxin 5be38dacb1 【新手剧情】起名界面添加回调 2021-11-15 13:10:59 +08:00
ZhangBiao ff3fcf3db9 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 09:56:59 +08:00
jiaoyangna 075de29090 编队界面看神将情报错误修改
(cherry picked from commit c8e7d0cdd4)
2021-11-12 15:52:09 +08:00
jiaoyangna 021b0e03be 魂灵宝界面修改提交 2021-11-12 11:26:02 +08:00
jiaoyangna 63b1f6456e 魂灵宝界面修改提交 2021-11-12 11:14:26 +08:00
jiaoyangna 9a261f5c13 法宝界面文字大小修改 2021-11-12 09:55:00 +08:00
ZhangBiao 36f24a4d3c 【魂印界面】界面背景颜色随物品品质更改 2021-11-11 17:58:40 +08:00
ZhangBiao db15950d6a Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:56:10 +08:00
jiaoyangna d1cb61fc18 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:48:59 +08:00
ZhangBiao 3eca9bec47 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:11:04 +08:00
ZhangBiao c104bd65a7 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
jiaoyangna bdb08206df Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 18:35:53 +08:00
jiaoyangna ceb7ee3602 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-10 18:35:38 +08:00
ZhangBiao cc316086e9 【新·物品】界面提交 2021-11-10 15:03:18 +08:00
ZhangBiao f74ce2f895 【新·物品】界面提交 2021-11-10 14:53:35 +08:00
ZhangBiao 7efdfd5029 【新·装备】增加战力对比图标 2021-11-09 18:24:38 +08:00
ZhangBiao c627c5cd28 【新·魂灵宝】增加战力对比图片 2021-11-09 17:35:27 +08:00
ZhangBiao aa9cc34792 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 17:06:59 +08:00
ZhangBiao f18880622e 【新·魂灵宝】提交 2021-11-09 17:06:47 +08:00
gaoxin f23a455797 【魂印】详情界面优化 2021-11-09 15:48:56 +08:00
ZhangBiao 76c3c5c0bf 【新·魂灵宝】提交 2021-11-09 14:39:27 +08:00
ZhangBiao fdffaf846e 【新·魂灵宝】界面提交 2021-11-09 11:42:19 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
gaoxin 5f0dc622a5 【皮肤】背包内解锁孙悟空皮肤,弹出是否前往穿戴,点击前往,跳转到神将传说界面 2021-11-08 15:12:48 +08:00
wangzhenxing e99f8c285f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 14:02:57 +08:00
wangzhenxing 95b7fceb34 [神魂]======神魂升级后技能描述修改 2021-11-08 14:02:33 +08:00
ZhangBiao 0fc2ec5b08 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:07:35 +08:00
ZhangBiao 2621f0f9f8 【升星有礼】白骨精进阶10星,获得的展示界面没有天赋详情 2021-11-08 11:07:11 +08:00
jiaoyangna 024b684999 排行榜神魂放大镜显示错误修改 2021-11-08 10:51:51 +08:00
wangzhenxing 99452354bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:21:30 +08:00
wangzhenxing a92a76e3ab 【神魂】=====技能描述修改 2021-11-05 17:21:18 +08:00
jiaoyangna 2aea503619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:14:08 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
gaoxin 89957b0787 【坐骑、称号属性】需要在背包激活时就加属性,而不是必须要佩戴一次 2021-11-05 17:12:35 +08:00
ZhangBiao 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +08:00
ZhangBiao bccd6751eb 【无尽密保】文字显示错误修改 2021-11-04 15:44:13 +08:00
jiaoyangna 154aa77cd3 神魂特效修改提交 2021-11-04 10:46:25 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
jiaoyangna 34d8cf4440 神魂位置提交 2021-11-04 09:27:56 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00
ZhangBiao 2fd25aced5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 16:59:15 +08:00
ZhangBiao 81dadae61f 【界面优化】提交 2021-11-02 16:58:48 +08:00
gaoxin 44415cfded 【坐骑】获取新坐骑,点击前往,展示新坐骑 2021-11-02 16:42:36 +08:00
ZhangBiao 0e5e559220 【界面优化】法宝归元 2021-11-02 13:52:48 +08:00
ZhangBiao 1e203c822c 【界面优化】好感度,天枢密卷 2021-11-02 13:41:27 +08:00
ZhangBiao 68525db92e 【界面优化】提交 2021-11-02 11:06:13 +08:00
ZhangBiao 8a9d52656f 【界面优化】山河社稷图、仙缘汇聚箱 2021-11-02 09:29:07 +08:00
gaoxin 0c1044ab67 Revert "Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法""
This reverts commit d2c8daffce.
2021-11-01 18:59:21 +08:00
zhangshanxue d2c8daffce Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法"
This reverts commit 87210b9d73.
2021-11-01 18:53:39 +08:00
ZhangBiao 87210b9d73 【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法 2021-11-01 17:21:59 +08:00
ZhangBiao 55f2561db3 【英雄归元】英雄归元后属性值没有重置 2021-10-29 15:11:48 +08:00