jiaoyangna
|
d3efa809d8
|
竞技守卫名字修改提交
|
2021-03-12 16:35:24 +08:00 |
jiaoyangna
|
7fe83b0cea
|
社稷大点领取奖励后宝箱状态修改
|
2021-03-12 15:55:31 +08:00 |
ZhangBiao
|
aaf5ecbc70
|
Merge branch '0功能/silingshilian' of http://60.1.1.230/gaoxin/JL_Client into 0功能/silingshilian
|
2021-03-11 19:35:16 +08:00 |
ZhangBiao
|
b432be96a6
|
【建木神树】增加特效
|
2021-03-11 19:35:07 +08:00 |
jiaoyangna
|
40e16c2601
|
四灵提交
|
2021-03-11 18:47:56 +08:00 |
jiaoyangna
|
cf02c49ac5
|
领取奖励界面修改提交
|
2021-03-11 17:35:04 +08:00 |
jiaoyangna
|
e177f63787
|
系统消息新类型添加标签
|
2021-03-11 17:06:08 +08:00 |
jiaoyangna
|
6899e700de
|
白片修改。神应解锁界面修改提交
|
2021-03-11 15:33:18 +08:00 |
jiaoyangna
|
95d7c4cfea
|
【四灵试炼】手动下阵神将,神将状态不会变,还是“已上阵”状态
|
2021-03-11 15:26:57 +08:00 |
jiaoyangna
|
db6c53a113
|
品阶错误修改
|
2021-03-11 15:11:04 +08:00 |
jiaoyangna
|
880e702a76
|
【四灵试炼】在排行榜中选择任意玩家进行切磋或其他跳转操作,返回后除第一名外其它玩家信息未刷新
|
2021-03-11 14:57:09 +08:00 |
jiaoyangna
|
8cf7fb6b2e
|
【四灵试炼】排行榜从第二名开始所有人的名字都变成“胆子超级大”第一名正常
|
2021-03-11 14:52:12 +08:00 |
jiaoyangna
|
a5dcdd4e7f
|
查看宝物报错修改
|
2021-03-11 14:44:48 +08:00 |
jiaoyangna
|
6b9a61def7
|
助战不显示宝物提交
|
2021-03-11 14:36:03 +08:00 |
jiaoyangna
|
400512d4b5
|
四灵助战宝器修改宝器修改
|
2021-03-11 11:35:56 +08:00 |
jiaoyangna
|
38ca3ae439
|
四灵立绘修改
|
2021-03-10 19:30:48 +08:00 |
jiaoyangna
|
07adb69165
|
报错修改
|
2021-03-10 18:03:36 +08:00 |
jiaoyangna
|
6b5b1f934e
|
Merge branch '0功能/silingshilian' of http://60.1.1.230/gaoxin/JL_Client into 0功能/silingshilian
|
2021-03-10 17:31:58 +08:00 |
jiaoyangna
|
a7353213aa
|
四灵提交
|
2021-03-10 17:31:40 +08:00 |
ZhangBiao
|
3c45f9eb24
|
【建木神树】提交
|
2021-03-10 16:04:26 +08:00 |
ZhangBiao
|
f6af5a6a72
|
【建木神树】红点
|
2021-03-10 15:54:42 +08:00 |
ZhangBiao
|
891dd5ca5b
|
【建木神树】
|
2021-03-10 15:01:18 +08:00 |
jiaoyangna
|
37dba071eb
|
跳转修改
|
2021-03-09 16:52:44 +08:00 |
jiaoyangna
|
cb08764083
|
四灵修改提交
|
2021-03-09 16:48:05 +08:00 |
jiaoyangna
|
b904b531af
|
四灵提交
|
2021-03-09 16:21:39 +08:00 |
ZhangBiao
|
fdb71b6cad
|
【宝物详情】界面修改
|
2021-03-09 14:42:17 +08:00 |
ZhangBiao
|
7fb0a9f84a
|
提交
|
2021-03-09 10:27:28 +08:00 |
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 |