Commit Graph

573 Commits (7f9726e006ee5aad3afb3dc0318444452bc15218)

Author SHA1 Message Date
ZhangBiao 94ed6ad618 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-13 13:56:43 +08:00
wangzhenxing aaa4b987eb 玉虚论道修改 2021-09-11 19:47:23 +08:00
ZhangBiao 41282c144c 【七界试炼】七界币增加加号 2021-09-11 15:47:19 +08:00
wangzhenxing e2f7284507 qqqq 2021-09-10 15:50:24 +08:00
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +08:00
jiaoyangna a012ece114 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 10:27:26 +08:00
gaoxin 17ebbc1872 【优化】灵兽商城商品上显示当前已有的灵兽碎片 2021-09-06 18:19:45 +08:00
jiaoyangna 5af2fc261d 心魔修改提交 2021-09-03 18:56:46 +08:00
jiaoyangna 17f6cb8ff1 报错修改 2021-09-03 18:43:03 +08:00
jiaoyangna 4d5876eb28 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
2021-09-02 19:33:48 +08:00
jiaoyangna 13909e60aa 编队id修改 2021-09-02 17:29:44 +08:00
jiaoyangna 96f2530ae8 加号修改 2021-09-02 16:20:33 +08:00
jiaoyangna 37c1c77737 添加道具 太初之气 加号 2021-09-02 16:17:26 +08:00
ZhangBiao 6bbf30e344 【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000 2021-09-02 11:19:29 +08:00
jiaoyangna 4f266a20b9 红点问题修改提交 2021-09-01 14:17:21 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna ad9e76bda5 四灵试炼修改提交 2021-08-31 19:03:29 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
ZhangBiao 6c2e75b384 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-20 14:40:19 +08:00
jiaoyangna bb8ca3c5ca 四元阵跳转修改 2021-08-19 16:44:13 +08:00
ZhangBiao 9971d286ea 【寻宝迷踪】人物箭头提交 2021-08-16 15:37:01 +08:00
ZhangBiao 57cdcc0809 【寻宝迷踪】增加到达特效 2021-08-13 15:34:06 +08:00
jiaoyangna 76dbc01270 Merge branch 'china/dev' into 0功能/silingshilian 2021-08-12 15:54:58 +08:00
ZhangBiao bbe2bb6d6d 【寻宝迷踪】提交 2021-08-12 12:00:18 +08:00
ZhangBiao 13777a78cb 【寻宝迷踪】增加主角箭头 2021-08-11 19:33:01 +08:00
ZhangBiao d017873b79 【寻宝迷踪】提交 2021-08-10 15:27:32 +08:00
jiaoyangna 34357fddff 滑动条修改提交 2021-08-06 15:47:31 +08:00
jiaoyangna 5cf3388a59 滑动 回弹修改提交 2021-08-06 11:29:06 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	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/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.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/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
jiaoyangna 488b7469f6 【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
2021-08-04 15:52:30 +08:00
jiaoyangna 3f9b6be120 【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
2021-08-04 15:36:39 +08:00
wangzhenxing 4358ef97e3 [bug]====聊天界面称号特效穿透问题修改 2021-08-02 14:27:13 +08:00
ZhangBiao e829b33d14 【万象商会】白篇处理 2021-07-30 16:34:50 +08:00
gaoxin 5aadeb406b 【聊天】聊天框根据内容跳转到不同的频道 2021-07-30 14:07:08 +08:00
jiaoyangna f4cc4d7df6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:46:11 +08:00
jiaoyangna 7ee1ef9910 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity5.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
#	Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
2021-07-28 17:45:59 +08:00
gaoxin e552db5499 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:43:04 +08:00
gaoxin ef78e0ae21 【跨服聊天】添加跨服聊天频道 2021-07-28 17:42:58 +08:00
jiaoyangna 7ac8f03cd3 Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
2021-07-28 16:58:52 +08:00
wangzhenxing 68e3a32140 [bug]====称号层级修改 2021-07-28 16:41:37 +08:00
wangzhenxing ef714577e8 [bug]========称号显示修改 2021-07-28 16:10:58 +08:00
jiaoyangna 527295f30c 宝物优化 2021-07-28 10:51:39 +08:00
zhangqiang 71f7e8a469 Merge branch 'china/dev' into china/jumpserver
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-27 11:26:30 +08:00
ZhangBiao 07de90eb45 【提交】 2021-07-26 15:07:49 +08:00
jiaoyangna 4590076eb9 Revert "宝物培养修改提交"
This reverts commit bcd0651029.
2021-07-26 10:00:59 +08:00
ZhangBiao 7e9fad28b7 【万象商会】提交 2021-07-24 19:33:56 +08:00
ZhangBiao 4c73ac0976 【万象商会】刷新 2021-07-24 18:59:42 +08:00
ZhangBiao ccc208b2c4 【万象商会】界面关闭 2021-07-24 17:02:30 +08:00
jiaoyangna fd7d51168d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:12:46 +08:00
jiaoyangna bcd0651029 宝物培养修改提交 2021-07-23 19:12:42 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
wangzhenxing 20bf67d50e 【称号】====称号特效显示修改,称号特效预设修改 2021-07-23 18:23:55 +08:00
wangzhenxing 02cea65055 [称号]====跨服称号资源提交 2021-07-23 11:20:05 +08:00
gaoxin 0db39ccbe3 Merge branch 'china/ios' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
2021-07-22 19:39:14 +08:00
ZhangBiao 190f3722a8 Merge branch 'china/dev' into 0优化/副本界面 2021-07-22 14:04:11 +08:00
JLIOSM1 d680e5a507 Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
#	Assets/StreamingAssets/Res/PackConfig.txt
#	Assets/StreamingAssets/Res/_ReadMe.md
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
#	Assets/StreamingAssets/Res/loading1.png
#	Assets/StreamingAssets/Res/loading1.png.meta
#	Assets/StreamingAssets/Res/loading2.png
#	Assets/StreamingAssets/Res/loading2.png.meta
#	Assets/StreamingAssets/Res/loading3.png
#	Assets/StreamingAssets/Res/loading3.png.meta
#	Assets/StreamingAssets/Res/loading4.png
#	Assets/StreamingAssets/Res/loading4.png.meta
#	Assets/StreamingAssets/Res/loading5.png
#	Assets/StreamingAssets/Res/loading5.png.meta
#	Assets/StreamingAssets/Res/loading6.png
#	Assets/StreamingAssets/Res/loading6.png.meta
#	Assets/StreamingAssets/Res/loading_caohua.png.meta
#	Assets/StreamingAssets/Res/loading_xipu.png.meta
#	Assets/StreamingAssets/Res/login_caohua.png.meta
#	Assets/StreamingAssets/Res/login_video.mp4.meta
#	Assets/StreamingAssets/Res/login_xipu.png.meta
2021-07-21 17:15:36 +08:00
JLIOSM1 c2dfe0ee92 【IOS提审】链接提审服时,部分按钮跳转到妖晶充值 2021-07-21 11:33:09 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
JLIOSM1 56e7492a91 【商店】修复妖精商店资源回收导致白片 2021-07-16 15:37:48 +08:00
ZhangBiao 7e17f8c3a1 Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-07-15 19:48:50 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
ZhangBiao 109a109301 Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
#	Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/StreamingAssets/Android.meta
2021-07-15 16:19:05 +08:00
gaoxin 1f4499e8bb 【物品特效】修复魂印特效显示错误 2021-07-09 17:05:55 +08:00
gaoxin be7cc055a1 【物品特效】不再根据品质显示特效,根据新字段Quantity1判断显示 2021-07-09 14:56:57 +08:00
ZhangBiao 5e1897515b 【商店】商店黑屏修复 2021-07-09 11:10:38 +08:00
ZhangBiao e64223b78b 【副本】新界面提交 2021-07-06 16:30:58 +08:00
ZhangBiao 7b66ae5db4 【副本】新界面 2021-07-06 14:47:10 +08:00
jiaoyangna bd030bedbc 神将来源 新人商城 描述修改 2021-07-05 17:18:49 +08:00
jiaoyangna c038859400 【ID1017091】
【神将来源】跳转首充,来源界面自动关闭,再次打开情报界面自动弹出
2021-07-05 11:29:05 +08:00
jiaoyangna 19247e296e 神将来源跳转修改提交 2021-07-02 11:23:07 +08:00
jiaoyangna 9b01d308e8 孙悟空添加新人商城 2021-07-02 11:13:59 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
jiaoyangna 410a0cac4f 神将来源跳转星辰商店修改提交 2021-07-01 18:22:36 +08:00
ZhangBiao 36ccbe968b 【森罗幻境】排行榜信息冗余修改 2021-07-01 15:42:23 +08:00
jiaoyangna 2cbb0b0a59 添加特效 2021-06-30 18:46:15 +08:00
jiaoyangna 3fadc63852 商店物品添加特效 2021-06-30 18:12:24 +08:00
jiaoyangna 9d11a48f70 跳转返回报错修改 2021-06-30 16:21:37 +08:00
jiaoyangna a4281ed031 四元阵跳转修改 2021-06-30 16:07:37 +08:00
jiaoyangna e44449391d 神将来源修改提交 2021-06-30 15:47:13 +08:00
jiaoyangna b5324c165a 神将来源碎皮合成修改提交 2021-06-30 15:27:27 +08:00
jiaoyangna a1c397d1f3 无尽商店添加需刷新 2021-06-30 14:32:58 +08:00
jiaoyangna b65e6c7bac 神将来源修改提交 2021-06-30 14:21:02 +08:00
jiaoyangna de642a3572 去掉点击事件 2021-06-30 10:48:50 +08:00
jiaoyangna f834e2e17d 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-30 10:12:44 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
zhangqiang 6f7d6731a4 【特效】主城/挂机界面自己小人脚底添加光圈4 2021-06-25 11:52:54 +08:00
zhangqiang 20ffda9ec2 【特效】主城/挂机界面自己小人脚底添加光圈3 2021-06-24 18:13:17 +08:00
zhangqiang a1f0db3d38 【特效】主城/挂机界面自己小人脚底添加光圈2 2021-06-24 16:19:41 +08:00
zhangqiang c7f8a84c99 【特效】主城/挂机界面自己小人脚底添加光圈 2021-06-24 16:15:39 +08:00
gaoxin efca8d1244 【称号】修复老包中称号报错 2021-06-22 17:42:18 +08:00
ZhangBiao 4fdbc4a559 【降妖夺宝】抽卡跳转修改 2021-06-21 11:45:03 +08:00
jiaoyangna 60b2cf1cf6 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
2021-06-18 18:27:01 +08:00
gaoxin 21875c589f 【称号】称号特效显示兼容处理 2021-06-18 11:31:49 +08:00
jiaoyangna 10c86e509a 超凡入圣修改提交 2021-06-18 10:50:04 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
zhangqiang 8b4aa53984 【心魔试炼】3 2021-06-09 20:29:50 +08:00
zhangqiang d21ebe57bb 【心魔试炼】2 2021-06-09 20:12:11 +08:00
zhangqiang d91c57f6ea 【心魔试炼】 2021-06-09 19:48:28 +08:00
gaoxin 498bc9a9b5 【称号】显示再优化,老包也能正常显示 2021-06-08 14:06:12 +08:00
gaoxin 8d6168a7d9 【称号】优化称号在老包中的显示 2021-06-08 11:04:11 +08:00
gaoxin 3204bd5945 【upview】优化被关闭后依然可以通过事件触发报错的问题 2021-06-05 00:25:54 +08:00
gaoxin 518cb7dac1 【无用log】 2021-06-04 23:59:31 +08:00
ZhangBiao 39180183a9 【任务头像】红点问题修改 2021-06-04 18:41:32 +08:00
ZhangBiao 4b708011bc 【玩家信息】红点问题修复 和log清楚 2021-06-04 16:10:17 +08:00
gaoxin fb6338de41 【挂机】修复伤害数字不消失 2021-06-03 19:10:41 +08:00
gaoxin ec6404419d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:10:20 +08:00
gaoxin 02f02206ca 【循环滚动】修复快速切换报错 2021-06-03 18:10:15 +08:00
ZhangBiao 1d697c5370 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 17:59:27 +08:00
ZhangBiao d19325ce7b 【公会红点】报错修改 2021-06-03 17:59:14 +08:00
wangzhenxing 9c3f1cb5eb [称号]====挂机界面特效显示修改,称号位置修改 2021-06-03 15:52:12 +08:00
wangzhenxing 200e48ed73 [称号]=====称号高度设置 2021-06-03 11:23:05 +08:00
gaoxin d65a7fd11a 【称号】修复地图称号不显示 2021-06-02 20:53:49 +08:00
gaoxin b7c8ed1ee1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 19:49:20 +08:00
gaoxin 6f6df7f5d6 【称号】在地图中删除称号上的canvas 2021-06-02 19:49:14 +08:00
wangzhenxing 9bd4103768 【称号】====称号特效显示修改提交 2021-06-02 18:26:31 +08:00
wangzhenxing 6d41cde054 [称号]=======称号无法卸下修改提交,称号高度修改 2021-06-02 14:47:54 +08:00
gaoxin 548f3f9f00 【称号】修复老包称号显示错误的问题 2021-06-02 14:32:16 +08:00
gaoxin 39bb3d5c06 【称号】修改称号节点为通用节点 2021-06-01 21:13:03 +08:00
ZhangBiao 681b3b63bb 【每日礼包】特效问题修改 2021-06-01 20:02:48 +08:00
zhangqiang 028a31941f 【背包】背包中道具详情没有“使用”按钮 2021-05-29 20:44:43 +08:00
ZhangBiao 717b0039cb 【修行】印记提交2 2021-05-29 19:49:25 +08:00
ZhangBiao 1d4842a7d6 【修行】印记提交 2021-05-29 19:32:47 +08:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +08:00
jiaoyangna 33909a2f91 【旗开得胜】社稷赏商店购买限购商品到达上限后,页面不限时已售空,需要切换页签。 2021-05-28 15:02:17 +08:00
gaoxin 1e36398a50 【内存优化】Util.Loadsprite 替换为 spLoader 2021-05-28 14:41:58 +08:00
zhangqiang fe6b69bfe6 【bug】提交 2021-05-28 10:32:42 +08:00
gaoxin d0b8f8db8e 【bug】修复报错 2021-05-27 20:24:33 +08:00
gaoxin 21208dcf58 【挂机】金钱特效报错 2021-05-27 17:39:36 +08:00
gaoxin 9b1a412eb8 【log】无用log删除 2021-05-27 16:50:49 +08:00
zhangqiang 0bcd6ade1f 【山河社稷图】bug + 资源 前端得刷资源 2021-05-27 14:06:20 +08:00
gaoxin 7a972628c3 Merge branch 'china/dev' into china/dev-c 2021-05-27 10:19:53 +08:00
zhangqiang aca4aa47ac 【音效修改】 2021-05-26 19:40:03 +08:00
wangzhenxing b7eaf9a65a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 16:03:40 +08:00
wangzhenxing d821836909 福利红包修改提交 2021-05-26 16:03:28 +08:00
zhangqiang 945ee5a968 【bug提交】 2021-05-26 15:47:29 +08:00
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
zhangqiang 281e19ad74 【心魔试炼】一键 2021-05-26 09:53:41 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00