Commit Graph

9277 Commits (1152586ff141daeb0d7cd55fcd7607ffcd3a678e)
 

Author SHA1 Message Date
jiaoyangna 1152586ff1 好感度提交 2021-09-26 09:54:58 +08:00
jiaoyangna c3dfb94905 好感度协议提交 2021-09-23 13:47:41 +08:00
jiaoyangna a8eeec83f6 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-22 20:53:08 +08:00
jiaoyangna 529094b6ad 好感度第一次提交 2021-09-22 20:47:13 +08:00
jiaoyangna ca74a5c158 玲珑宝镜动画修改 2021-09-22 20:39:06 +08:00
jiaoyangna 7e5061844b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:23:45 +08:00
jiaoyangna af3f2b8f32 添加玲珑商市跳转 2021-09-22 20:22:59 +08:00
yuanshuai bdeade9d71 【四象心法】点击消耗道具显示详情 2021-09-22 20:08:43 +08:00
yuanshuai d8e88d4fba 【四象心法】点击消耗道具显示详情 2021-09-22 20:08:27 +08:00
jiaoyangna 4910773749 玲珑宝镜修改提交 2021-09-22 20:04:08 +08:00
jiaoyangna 0805ef4ebc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:02:01 +08:00
ZhangBiao c29ad91a4c 【七界试炼】修改提交 2021-09-22 19:56:13 +08:00
ZhangBiao 5a7e0a4dc8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 19:38:32 +08:00
ZhangBiao 32585cec01 【七界试炼】增加怪物详情界面 2021-09-22 19:38:16 +08:00
gaoxin 3546e9ac7c 【数数】报错修改 2021-09-22 18:05:57 +08:00
gaoxin 5d0d24066a 【数数】关闭崩溃上报事件 2021-09-22 18:03:07 +08:00
jiaoyangna 2f16f43379 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 18:02:32 +08:00
jiaoyangna aeecd125e0 【ID1010383】
【优化】玲珑宝镜新增进度条奖励
2021-09-22 17:34:16 +08:00
gaoxin 8d9ac3bb69 【打包工具】修改生成Apk的包名 2021-09-22 17:07:51 +08:00
ZhangBiao 042df03091 【七界试炼】零点不刷新修改 2021-09-22 16:45:23 +08:00
ZhangBiao 5f80bbb7a1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 16:26:04 +08:00
ZhangBiao 0b9055110d 【七界试炼】红点 2021-09-22 16:25:29 +08:00
yuanshuai 573cb8a8e3 误操作 2021-09-22 16:17:09 +08:00
gaoxin ddf0e9b981 【资源名修改后自动生成文件提交】 2021-09-22 16:01:11 +08:00
gaoxin 36dff25c3e 【资源名重复修改】 2021-09-22 15:55:19 +08:00
gaoxin f607ad73bb Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-22 15:42:50 +08:00
gaoxin 579b566935 【四象心法】加入新的战斗力计算 2021-09-22 15:42:28 +08:00
yuanshuai b99e643da5 四象心法预设合并 2021-09-22 15:41:39 +08:00
yuanshuai 82937ae35e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 15:39:24 +08:00
yuanshuai ab7570f3bb .meta 2021-09-22 15:39:07 +08:00
gaoxin 34f3f42a04 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
2021-09-22 15:36:10 +08:00
ZhangBiao 371c0fc080 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-09-22 15:21:59 +08:00
yuanshuai e33fad0054 最新协议提交 2021-09-22 15:20:25 +08:00
ZhangBiao dc2343073d 【七界】资源提交 2021-09-22 15:20:09 +08:00
ZhangBiao 40fb962879 【七界试炼】合并后提交 2021-09-22 15:19:27 +08:00
yuanshuai b145159311 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 15:13:12 +08:00
yuanshuai db18313495 Merge branch '0功能/四象心法' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
#	Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	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/ActivityProto.proto
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-09-22 15:12:32 +08:00
gaoxin fa85ecb870 Revert "Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题""
This reverts commit 0e86945c53.
2021-09-22 14:59:34 +08:00
ZhangBiao cea14746f8 【七界试炼】提交 2021-09-22 13:33:48 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
gaoxin bc659b68f8 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
2021-09-22 10:54:15 +08:00
gaoxin e5af89fac9 Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
2021-09-22 10:37:42 +08:00
jiaoyangna 488753ab83 四灵编队修改提交
(cherry picked from commit 191603b77f)
2021-09-18 19:19:30 +08:00
jiaoyangna 71b380cdd2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-18 18:55:21 +08:00
jiaoyangna 4e5ef30243 在线四灵编队修改提交 2021-09-18 18:55:07 +08:00
gaoxin 2ca77d75ef 【易经宝库】修服选中大奖后次数显示异常 2021-09-18 18:40:21 +08:00
jiaoyangna a628176640 四灵 修改提交
(cherry picked from commit 675cda9b4d)
2021-09-18 18:26:21 +08:00
ZhangBiao 47485caeda 【七界试炼】无免费次数按钮逻辑修改 2021-09-18 18:23:48 +08:00
jiaoyangna 4a494fac11 在线刷新一下编队 2021-09-18 18:19:45 +08:00
ZhangBiao 1ddc89ad54 【七界试炼】提交 2021-09-18 18:18:22 +08:00