Commit Graph

2687 Commits (2f9e47fd1f407e7e54cdd74f83384e7dac7575e7)

Author SHA1 Message Date
jiaoyangna 2f9e47fd1f 红点修改提交 2021-03-08 17:54:22 +08:00
jiaoyangna aad4fcb9ac 四灵修改提交 2021-03-08 17:32:16 +08:00
jiaoyangna 4517d1e9f5 本地化 2021-03-08 16:52:55 +08:00
jiaoyangna 6150350a5c 修改提交 2021-03-08 16:30:32 +08:00
jiaoyangna 49c527a9bb 装备界面提交 2021-03-08 14:20:27 +08:00
jiaoyangna cf3c571182 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
2021-03-08 11:14:15 +08:00
jiaoyangna 02ca65089f Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Harmony.meta
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
2021-03-08 10:27:14 +08:00
jiaoyangna b9cad9a855 四灵修改提交 2021-03-01 20:26:43 +08:00
jiaoyangna 7d9cee89ab 帮助修改 2021-03-01 20:14:46 +08:00
jiaoyangna d4bb9ded6c 编队界面 排序修改 2021-03-01 20:05:31 +08:00
jiaoyangna d3e6de38bb 四灵 修改 2021-03-01 19:53:28 +08:00
JieLing 39a41f45f9 【回滚提交】 2021-03-01 19:48:34 +08:00
jiaoyangna 955bd044f1 四灵提交 2021-03-01 18:35:35 +08:00
zhangqiang 1dd774601a 语法错误 2021-03-01 16:57:23 +08:00
jiaoyangna 04a1dacedd 四灵bug 修改 2021-03-01 10:19:48 +08:00
gaoxin 6faa7a29ae Merge branch '0功能/周版本优化0303' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-02-27 17:32:37 +08:00
gaoxin 1ca6517454 Merge commit '0bd2c53e6c38b87ace2ab14a979a56362d35fc7e' into 0功能/周版本优化0303 2021-02-27 17:31:09 +08:00
zhangqiang 73d50e9777 Merge branch '0功能/周版本优化0303' into master_xma_local 2021-02-27 16:55:47 +08:00
zhangqiang 656ebc2d44 【十绝阵】排名修改提交 2021-02-27 16:54:52 +08:00
zhangqiang 2ef4340998 代码错误 2021-02-27 16:52:26 +08:00
zhangqiang ed26774755 【ScrollCycleView】修改6 2021-02-27 16:52:18 +08:00
wangzhenxing 55972b70d7 【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻 2021-02-27 16:52:12 +08:00
wangzhenxing 9362f341a6 [战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻 2021-02-27 16:52:06 +08:00
zhangqiang e3bae7a821 提交 2021-02-27 16:52:00 +08:00
zhangqiang 1604821615 【ScrollCycleView】修改5 2021-02-27 16:51:55 +08:00
jiaoyangna bc2d95ddec 四灵 提交 2021-02-26 17:44:13 +08:00
wangzhenxing 0bd2c53e6c 【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻 2021-02-26 18:19:54 +09:00
wangzhenxing 7ae746b318 [战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻 2021-02-26 17:00:05 +09:00
zhangqiang 545dee3df1 【ScrollCycleView】修改4 2021-02-26 10:37:39 +08:00
gaoxin edec649f64 【bug】修复合成时log信息导致的报错 2021-02-26 10:13:27 +08:00
gaoxin 584431db2e 【bug】修复新将战斗跳过回到新将界面还会播放战斗音效的问题 2021-02-26 10:08:36 +08:00
wangzhenxing 0e23ca3cf8 [战斗]======= 2021-0303发布计划 战斗修改 2021-02-25 19:48:24 +09:00
gaoxin 0babcc640b 【报警】添加用于确认登录成功的接口,后端用于登录监测告警 2021-02-25 14:33:23 +08:00
jiaoyangna fe881897dc Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-25 13:47:09 +08:00
jiaoyangna e709c80428 竞技场修改 2021-02-25 13:47:04 +08:00
zhangqiang 5699b89258 【ScrollCycleView】修改3 2021-02-25 12:04:31 +08:00
zhangqiang 67d0dfa44f 【抽卡奖池】显示问题 2021-02-25 12:00:27 +08:00
jiaoyangna f3cc8413f2 主题活动提交 2021-02-25 10:20:14 +08:00
zhangqiang 39d43b11bc 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变2 2021-02-24 19:48:04 +08:00
gaoxin bb68af637a 【战斗】修复孙悟空和观音菩萨同时死亡导致报错的问题 2021-02-24 17:02:31 +08:00
zhangqiang d454c3bf08 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变 2021-02-24 16:47:20 +08:00
zhangqiang ac3fe3f251 【升星界面调整】9升10星,十星位置需调整 2021-02-24 10:53:21 +08:00
zhangqiang dc42a492e7 【排行榜优化】排行榜信息分页读取 2021-02-24 10:13:43 +08:00
zhangqiang 497729e762 【优化】查找合成的时候英雄名字查找困难 英雄名字放在主页上 2021-02-23 20:50:56 +08:00
zhangqiang f7d62a72fc 恭喜获得界面中,道具名称过长的情况,改为显示4个字+省略号的形式显示,参考背包即可 2021-02-23 20:37:57 +08:00
zhangqiang 2bc7c4e72c 【逍遥游】逍遥游玩法幻魔事件结算会显示之前的金币特效 2021-02-23 17:16:38 +08:00
zhangqiang 37375a41f8 【鸿蒙阵】请先解锁前一个共鸣位置 2021-02-23 17:16:32 +08:00
jiaoyangna b331cfdac6 添加log 2021-02-23 16:58:40 +08:00
zhangqiang ced93fe8d3 【逍遥游】逍遥游玩法幻魔事件结算会显示之前的金币特效 2021-02-23 16:52:17 +08:00
zhangqiang fb035643fe 【鸿蒙阵】请先解锁前一个共鸣位置 2021-02-23 16:21:42 +08:00