Commit Graph

987 Commits (cadc9337da32f5d15e326456c67c8101683863e5)

Author SHA1 Message Date
jiaoyangna cadc9337da 删除log 2022-02-23 18:34:10 +08:00
jiaoyangna 88a67b0cbf 至尊降世修改提交 2022-02-23 18:33:40 +08:00
jiaoyangna 57198fce39 至尊降世兼容提交 2022-02-23 18:12:22 +08:00
jiaoyangna 6abf049eb7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-23 17:24:49 +08:00
jiaoyangna d0720e17b2 【ID1011178】
至尊降世活动拉到1000档
2022-02-23 17:24:34 +08:00
gaoxin 0ce89251f8 【选择神将】报错修复 2022-02-24 02:56:42 +08:00
gaoxin c2b4647418 【限时Up】加入神将版本判断 2022-02-11 16:22:44 +08:00
wangzhenxing 01506ba48c [角色天赋]======角色天赋显示修改 2022-02-10 17:52:40 +08:00
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